8000 Make pqsignal() available to pg_regress of ECPG and isolation suites. · larkly/postgres-docker@94ab763 · GitHub
[go: up one dir, main page]
Skip to content
8000

Commit 94ab763

Browse files
nmischnmisch
committed
Make pqsignal() available to pg_regress of ECPG and isolation suites.
Commit 453a5d9 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.
1 parent 481831b commit 94ab763

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

‎src/interfaces/ecpg/test/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,10 @@ clean distclean maintainer-clean:
4747

4848
all: pg_regress$(X)
4949

50-
pg_regress$(X): pg_regress_ecpg.o $(top_builddir)/src/test/regress/pg_regress.o
50+
pg_regress$(X): pg_regress_ecpg.o $(top_builddir)/src/test/regress/pg_regress.o $(top_builddir)/src/test/regress/pqsignal.o
5151
$(CC) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_EX) $^ $(LIBS) -o $@
5252

53-
$(top_builddir)/src/test/regress/pg_regress.o:
53+
$(top_builddir)/src/test/regress/pg_regress.o $(top_builddir)/src/test/regress/pqsignal.o:
5454
$(MAKE) -C $(dir $@) $(notdir $@)
5555

5656
# dependencies ensure that path changes propagate

‎src/test/isolation/Makefile

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,15 @@ OBJS = specparse.o isolationtester.o
2020

2121
all: isolationtester$(X) pg_isolation_regress$(X)
2222

23-
submake-regress:
23+
pg_regress.o:
2424
$(MAKE) -C $(top_builddir)/src/test/regress pg_regress.o
25-
26-
pg_regress.o: | submake-regress
2725
rm -f $@ && $(LN_S) $(top_builddir)/src/test/regress/pg_regress.o .
2826

29-
pg_isolation_regress$(X): isolation_main.o pg_regress.o
27+
pqsignal.o:
28+
$(MAKE) -C $(top_builddir)/src/test/regress pqsignal.o
29+
rm -f $@ && $(LN_S) $(top_builddir)/src/test/regress/pqsignal.o .
30+
31+
pg_isolation_regress$(X): isolation_main.o pg_regress.o pqsignal.o
3032
$(CC) $(CFLAGS) $^ $(libpq_pgport) $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@
3133

3234
isolationtester$(X): $(OBJS) | submake-libpq submake-libpgport
@@ -64,7 +66,7 @@ endif
6466
# so do not clean them here
6567
clean distclean:
6668
rm -f isolationtester$(X) pg_isolation_regress$(X) $(OBJS) isolation_main.o
67-
rm -f pg_regress.o
69+
rm -f pg_regress.o pqsignal.o
6870
rm -rf $(pg_regress_clean_files)
6971

7072
maintainer-clean: distclean

0 commit comments

Comments
 (0)
0