Commit 19acee8c authored by Alvaro Herrera's avatar Alvaro Herrera

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 9def031b;
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.
parent df5d9bb8
...@@ -3,11 +3,6 @@ ...@@ -3,11 +3,6 @@
REGRESS = commit_timestamp REGRESS = commit_timestamp
REGRESS_OPTS = --temp-config=$(top_srcdir)/src/test/modules/commit_ts/commit_ts.conf REGRESS_OPTS = --temp-config=$(top_srcdir)/src/test/modules/commit_ts/commit_ts.conf
check: prove-check
prove-check:
$(prove_check)
ifdef USE_PGXS ifdef USE_PGXS
PG_CONFIG = pg_config PG_CONFIG = pg_config
PGXS := $(shell $(PG_CONFIG) --pgxs) PGXS := $(shell $(PG_CONFIG) --pgxs)
...@@ -18,3 +13,8 @@ top_builddir = ../../../.. ...@@ -18,3 +13,8 @@ top_builddir = ../../../..
include $(top_builddir)/src/Makefile.global include $(top_builddir)/src/Makefile.global
include $(top_srcdir)/contrib/contrib-global.mk include $(top_srcdir)/contrib/contrib-global.mk
endif endif
check: prove-check
prove-check:
$(prove_check)
# src/test/modules/test_rls_hooks/Makefile # src/test/modules/test_pg_dump/Makefile
MODULE = test_pg_dump MODULE = test_pg_dump
PGFILEDESC = "test_pg_dump - Test pg_dump with an extension" PGFILEDESC = "test_pg_dump - Test pg_dump with an extension"
...@@ -8,11 +8,6 @@ DATA = test_pg_dump--1.0.sql ...@@ -8,11 +8,6 @@ DATA = test_pg_dump--1.0.sql
REGRESS = test_pg_dump REGRESS = test_pg_dump
check: prove-check
prove-check:
$(prove_check)
ifdef USE_PGXS ifdef USE_PGXS
PG_CONFIG = pg_config PG_CONFIG = pg_config
PGXS := $(shell $(PG_CONFIG) --pgxs) PGXS := $(shell $(PG_CONFIG) --pgxs)
...@@ -23,3 +18,8 @@ top_builddir = ../../../.. ...@@ -23,3 +18,8 @@ top_builddir = ../../../..
include $(top_builddir)/src/Makefile.global include $(top_builddir)/src/Makefile.global
include $(top_srcdir)/contrib/contrib-global.mk include $(top_srcdir)/contrib/contrib-global.mk
endif endif
check: prove-check
prove-check:
$(prove_check)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment