Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit0ae841a

Browse files
committed
Make pqsignal() available to pg_regress of ECPG and isolation suites.
Commit453a5d9 made it available to thesrc/test/regress build of pg_regress, but all pg_regress builds need thesame treatment. Patch 9.2 through 8.4; in 9.3 and later, pg_regressgets pqsignal() via libpgport.
1 parent453a5d9 commit0ae841a

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
@@ -15,13 +15,15 @@ OBJS = specparse.o isolationtester.o
1515

1616
all: isolationtester$(X) pg_isolation_regress$(X)
1717

18-
submake-regress:
18+
pg_regress.o:
1919
$(MAKE) -C$(top_builddir)/src/test/regress pg_regress.o
20-
21-
pg_regress.o: | submake-regress
2220
rm -f$@&&$(LN_S)$(top_builddir)/src/test/regress/pg_regress.o.
2321

24-
pg_isolation_regress$(X): isolation_main.o pg_regress.o
22+
pqsignal.o:
23+
$(MAKE) -C$(top_builddir)/src/test/regress pqsignal.o
24+
rm -f$@&&$(LN_S)$(top_builddir)/src/test/regress/pqsignal.o.
25+
26+
pg_isolation_regress$(X): isolation_main.o pg_regress.o pqsignal.o
2527
$(CC)$(CFLAGS)$^$(LDFLAGS)$(LDFLAGS_EX)$(LIBS) -o$@
2628

2729
isolationtester$(X):$(OBJS) | submake-libpq submake-libpgport
@@ -59,7 +61,7 @@ endif
5961
# so do not clean them here
6062
cleandistclean:
6163
rm -f isolationtester$(X) pg_isolation_regress$(X)$(OBJS) isolation_main.o
62-
rm -f pg_regress.o
64+
rm -f pg_regress.o pqsignal.o
6365
rm -rf$(pg_regress_clean_files)
6466

6567
maintainer-clean: distclean

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp