On 12/03/2012 04:02 PM, Andrew Dunstan wrote:
Looks like undefine is a new feature in gmake 3.82. I can reproduce
this on my SL6 box which has 3.81. I'll have to come up with something
other than ifdef, like
ifneq ($(USE_MODULE_DB),)
and use the override in dblink's Makefile to set it to the empty string.
Here's a version that seems to work with pre 3.82 versions of gmake.
cheers
andrew
diff --git a/contrib/dblink/Makefile b/contrib/dblink/Makefile
index a27db88..32314a0 100644
--- a/contrib/dblink/Makefile
+++ b/contrib/dblink/Makefile
@@ -11,6 +11,9 @@ DATA = dblink--1.1.sql dblink--1.0--1.1.sql
dblink--unpackaged--1.0.sql
REGRESS = dblink
+# the db name is hard-coded in the tests
+override USE_MODULE_DB =
+
ifdef USE_PGXS
PG_CONFIG = pg_config
PGXS := $(shell $(PG_CONFIG) --pgxs)
diff --git a/src/Makefile.global.in b/src/Makefile.global.in
index e10eead..9cc14da 100644
--- a/src/Makefile.global.in
+++ b/src/Makefile.global.in
@@ -428,6 +428,15 @@ submake-libpgport:
PL_TESTDB = pl_regression
CONTRIB_TESTDB = contrib_regression
+ifneq ($(MODULE_big),)
+ CONTRIB_TESTDB_MODULE = contrib_regression_$(MODULE_big)
+else
+ ifneq ($(MODULES),)
+ CONTRIB_TESTDB_MODULE = contrib_regression_$(MODULES)
+ else
+ CONTRIB_TESTDB_MODULE = contrib_regression
+ endif
+endif
ifdef NO_LOCALE
NOLOCALE += --no-locale
diff --git a/src/makefiles/pgxs.mk b/src/makefiles/pgxs.mk
index fd6473f..8acfe05 100644
--- a/src/makefiles/pgxs.mk
+++ b/src/makefiles/pgxs.mk
@@ -240,7 +240,11 @@ distclean maintainer-clean: clean
ifdef REGRESS
# Select database to use for running the tests
-REGRESS_OPTS += --dbname=$(CONTRIB_TESTDB)
+ifneq ($(USE_MODULE_DB),)
+ REGRESS_OPTS += --dbname=$(CONTRIB_TESTDB_MODULE)
+else
+ REGRESS_OPTS += --dbname=$(CONTRIB_TESTDB)
+endif
# where to find psql for running the tests
PSQLDIR = $(bindir)
--
Sent via pgsql-hackers mailing list (pgsql-hackers@postgresql.org)
To make changes to your subscription:
http://www.postgresql.org/mailpref/pgsql-hackers