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 9def031bd2;
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.

diff --git a/src/test/modules/commit_ts/Makefile b/src/test/modules/commit_ts/Makefile
index f814f767c444af198e2f3f9cf9aa0dd05bceb29b..86b93b5e762920f1ed8e9b34e14bc69715439ca9 100644 (file)
--- a/src/test/modules/commit_ts/Makefile
+++ b/src/test/modules/commit_ts/Makefile
@@ -3,11 +3,6 @@
 REGRESS = commit_timestamp
 REGRESS_OPTS = --temp-config=$(top_srcdir)/src/test/modules/commit_ts/commit_ts.conf
 
-check: prove-check
-
-prove-check:
-       $(prove_check)
-
 ifdef USE_PGXS
 PG_CONFIG = pg_config
 PGXS := $(shell $(PG_CONFIG) --pgxs)
@@ -18,3 +13,8 @@ top_builddir = ../../../..
 include $(top_builddir)/src/Makefile.global
 include $(top_srcdir)/contrib/contrib-global.mk
 endif
+
+check: prove-check
+
+prove-check:
+       $(prove_check)

diff --git a/src/test/modules/test_pg_dump/Makefile b/src/test/modules/test_pg_dump/Makefile
index 08d8903e721fbf66e1bddde5093e2ff454bc0fbf..5050572777d7ce609d85fc63cad5c2d1071a08d6 100644 (file)
--- a/src/test/modules/test_pg_dump/Makefile
+++ b/src/test/modules/test_pg_dump/Makefile
@@ -1,4 +1,4 @@
-# src/test/modules/test_rls_hooks/Makefile
+# src/test/modules/test_pg_dump/Makefile
 
 MODULE = test_pg_dump
 PGFILEDESC = "test_pg_dump - Test pg_dump with an extension"
@@ -8,11 +8,6 @@ DATA = test_pg_dump--1.0.sql
 
 REGRESS = test_pg_dump
 
-check: prove-check
-
-prove-check:
-       $(prove_check)
-
 ifdef USE_PGXS
 PG_CONFIG = pg_config
 PGXS := $(shell $(PG_CONFIG) --pgxs)
@@ -23,3 +18,8 @@ top_builddir = ../../../..
 include $(top_builddir)/src/Makefile.global
 include $(top_srcdir)/contrib/contrib-global.mk
 endif
+
+check: prove-check
+
+prove-check:
+       $(prove_check)