Skip to content

Commit e012e78

Browse files
committed
Fix two src/test/modules Makefiles
commit_ts and test_pg_dump were declaring targets before including the PGXS stanza, which meant that the "all" target customarily defined as the first (and therefore default target) was not the default anymore. Fix that by moving those target definitions to after PGXS. commit_ts was initially good, but I broke it in commit 9def031; test_pg_dump was born broken, probably copying from commit_ts' mistake. In passing, fix a comment mistake in test_pg_dump/Makefile. Backpatch to 9.6. Noted by Tom Lane.
1 parent 31eb145 commit e012e78

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

src/test/modules/commit_ts/Makefile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,6 @@
33
REGRESS = commit_timestamp
44
REGRESS_OPTS = --temp-config=$(top_srcdir)/src/test/modules/commit_ts/commit_ts.conf
55

6-
check: prove-check
7-
8-
prove-check:
9-
$(prove_check)
10-
116
ifdef USE_PGXS
127
PG_CONFIG = pg_config
138
PGXS := $(shell $(PG_CONFIG) --pgxs)
@@ -18,3 +13,8 @@ top_builddir = ../../../..
1813
include $(top_builddir)/src/Makefile.global
1914
include $(top_srcdir)/contrib/contrib-global.mk
2015
endif
16+
17+
check: prove-check
18+
19+
prove-check:
20+
$(prove_check)
Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# src/test/modules/test_rls_hooks/Makefile
1+
# src/test/modules/test_pg_dump/Makefile
22

33
MODULE = test_pg_dump
44
PGFILEDESC = "test_pg_dump - Test pg_dump with an extension"
@@ -8,11 +8,6 @@ DATA = test_pg_dump--1.0.sql
88

99
REGRESS = test_pg_dump
1010

11-
check: prove-check
12-
13-
prove-check:
14-
$(prove_check)
15-
1611
ifdef USE_PGXS
1712
PG_CONFIG = pg_config
1813
PGXS := $(shell $(PG_CONFIG) --pgxs)
@@ -23,3 +18,8 @@ top_builddir = ../../../..
2318
include $(top_builddir)/src/Makefile.global
2419
include $(top_srcdir)/contrib/contrib-global.mk
2520
endif
21+
22+
check: prove-check
23+
24+
prove-check:
25+
$(prove_check)

0 commit comments

Comments
 (0)