database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-03 20:02:46 +03:00
Code Activity

Make pqsignal() available to pg_regress of ECPG and isolation suites.

Browse Source 
Commit 453a5d91d4 made it available to the
src/test/regress build of pg_regress, but all pg_regress builds need the
same treatment.  Patch 9.2 through 8.4; in 9.3 and later, pg_regress
gets pqsignal() via libpgport.
This commit is contained in:
Noah Misch
2014-06-14 10:52:25 -04:00
parent 481831b438
commit 94ab763278
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/interfaces/ecpg/test/Makefile
View File

@ -47,10 +47,10 @@ clean distclean maintainer-clean:
all: pg_regress$(X) all: pg_regress$(X)
pg_regress$(X): pg_regress_ecpg.o $(top_builddir)/src/test/regress/pg_regress.o pg_regress$(X): pg_regress_ecpg.o $(top_builddir)/src/test/regress/pg_regress.o $(top_builddir)/src/test/regress/pqsignal.o
$(CC) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_EX) $^ $(LIBS) -o $@ $(CC) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_EX) $^ $(LIBS) -o $@
$(top_builddir)/src/test/regress/pg_regress.o: $(top_builddir)/src/test/regress/pg_regress.o $(top_builddir)/src/test/regress/pqsignal.o:
$(MAKE) -C $(dir $@) $(notdir $@) $(MAKE) -C $(dir $@) $(notdir $@)
# dependencies ensure that path changes propagate # dependencies ensure that path changes propagate

12
src/test/isolation/Makefile
View File

@ -20,13 +20,15 @@ OBJS = specparse.o isolationtester.o
all: isolationtester$(X) pg_isolation_regress$(X) all: isolationtester$(X) pg_isolation_regress$(X)
submake-regress: pg_regress.o:
$(MAKE) -C $(top_builddir)/src/test/regress pg_regress.o $(MAKE) -C $(top_builddir)/src/test/regress pg_regress.o
pg_regress.o: | submake-regress
rm -f $@ && $(LN_S) $(top_builddir)/src/test/regress/pg_regress.o . rm -f $@ && $(LN_S) $(top_builddir)/src/test/regress/pg_regress.o .
pg_isolation_regress$(X): isolation_main.o pg_regress.o pqsignal.o:
$(MAKE) -C $(top_builddir)/src/test/regress pqsignal.o
rm -f $@ && $(LN_S) $(top_builddir)/src/test/regress/pqsignal.o .
pg_isolation_regress$(X): isolation_main.o pg_regress.o pqsignal.o
$(CC) $(CFLAGS) $^ $(libpq_pgport) $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@ $(CC) $(CFLAGS) $^ $(libpq_pgport) $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@
isolationtester$(X): $(OBJS) | submake-libpq submake-libpgport isolationtester$(X): $(OBJS) | submake-libpq submake-libpgport
@ -64,7 +66,7 @@ endif
# so do not clean them here # so do not clean them here
clean distclean: clean distclean:
rm -f isolationtester$(X) pg_isolation_regress$(X) $(OBJS) isolation_main.o rm -f isolationtester$(X) pg_isolation_regress$(X) $(OBJS) isolation_main.o
rm -f pg_regress.o rm -f pg_regress.o pqsignal.o
rm -rf $(pg_regress_clean_files) rm -rf $(pg_regress_clean_files)
maintainer-clean: distclean maintainer-clean: distclean