diff options
| author | Noah Misch <noah@leadboat.com> | 2014-06-14 10:52:25 -0400 |
|---|---|---|
| committer | Noah Misch <noah@leadboat.com> | 2014-06-14 10:57:02 -0400 |
| commit | 94ab763278459ef8f279bdf98bcda9a73accad7e (patch) | |
| tree | 20dbf85e3c2ef61eea18bb9833f6777d26bba8b8 /src | |
| parent | 481831b4388ca4ad0abfa790ba0766cc72a05097 (diff) | |
Make pqsignal() available to pg_regress of ECPG and isolation suites.
Commit 453a5d91d49e4d35054f92785d830df4067e10c1 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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/interfaces/ecpg/test/Makefile | 4 | ||||
| -rw-r--r-- | src/test/isolation/Makefile | 12 |
2 files changed, 9 insertions, 7 deletions
diff --git a/src/interfaces/ecpg/test/Makefile b/src/interfaces/ecpg/test/Makefile index e899aef83c0..ce9842a1d5d 100644 --- a/src/interfaces/ecpg/test/Makefile +++ b/src/interfaces/ecpg/test/Makefile @@ -47,10 +47,10 @@ clean distclean maintainer-clean: 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 $@ -$(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 $@) # dependencies ensure that path changes propagate diff --git a/src/test/isolation/Makefile b/src/test/isolation/Makefile index 85a3c23f657..195168d49a5 100644 --- a/src/test/isolation/Makefile +++ b/src/test/isolation/Makefile @@ -20,13 +20,15 @@ OBJS = specparse.o isolationtester.o all: isolationtester$(X) pg_isolation_regress$(X) -submake-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 . -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 $@ isolationtester$(X): $(OBJS) | submake-libpq submake-libpgport @@ -64,7 +66,7 @@ endif # so do not clean them here clean distclean: 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) maintainer-clean: distclean |