database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-05-17 06:41:24 +03:00
Code

Fix two src/test/modules Makefiles

Browse Source 
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.
This commit is contained in:
Alvaro Herrera 2016-09-08 14:39:05 -03:00
parent df5d9bb8d5
commit 19acee8c5a
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/test/modules/commit_ts/Makefile
View File

@ -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)

12
src/test/modules/test_pg_dump/Makefile
View File

@ -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)