diff options
| author | Andrew Dunstan <andrew@dunslane.net> | 2016-02-27 12:28:21 -0500 |
|---|---|---|
| committer | Andrew Dunstan <andrew@dunslane.net> | 2016-02-27 12:28:21 -0500 |
| commit | 87cc6b57a911bf439ff9e53f1eddba58e9749ffe (patch) | |
| tree | 263500fc4b8a239b4105dd6adf0270acbf9505fc /src/test | |
| parent | c9578135f769072e2597b88402f256a398279c91 (diff) | |
Respect TEMP_CONFIG when pg_regress_check and friends are called
This reverts commit 9117985b6ba9beda4f280f596035649fc23b6233 in favor of
a more general solution.
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/isolation/Makefile | 4 | ||||
| -rw-r--r-- | src/test/regress/GNUmakefile | 10 |
2 files changed, 4 insertions, 10 deletions
diff --git a/src/test/isolation/Makefile b/src/test/isolation/Makefile index 4577509137e..3d272d5b592 100644 --- a/src/test/isolation/Makefile +++ b/src/test/isolation/Makefile @@ -55,7 +55,7 @@ installcheck: all ./pg_isolation_regress --bindir='$(bindir)' $(EXTRA_REGRESS_OPTS) --inputdir=$(srcdir) --schedule=$(srcdir)/isolation_schedule check: all - $(with_temp_install) ./pg_isolation_regress --temp-instance=./tmp_check --inputdir=$(srcdir) --bindir= $(EXTRA_REGRESS_OPTS) --schedule=$(srcdir)/isolation_schedule + $(with_temp_install) ./pg_isolation_regress --temp-instance=./tmp_check $(TEMP_CONF) --inputdir=$(srcdir) --bindir= $(EXTRA_REGRESS_OPTS) --schedule=$(srcdir)/isolation_schedule # Versions of the check tests that include the prepared_transactions test # It only makes sense to run these if set up to use prepared transactions, @@ -65,4 +65,4 @@ installcheck-prepared-txns: all temp-install ./pg_isolation_regress --bindir='$(bindir)' $(EXTRA_REGRESS_OPTS) --inputdir=$(srcdir) --schedule=$(srcdir)/isolation_schedule prepared-transactions check-prepared-txns: all temp-install - ./pg_isolation_regress --temp-instance=./tmp_check $(EXTRA_REGRESS_OPTS) --inputdir=$(srcdir) --schedule=$(srcdir)/isolation_schedule prepared-transactions + ./pg_isolation_regress --temp-instance=./tmp_check $(TEMP_CONF) $(EXTRA_REGRESS_OPTS) --inputdir=$(srcdir) --schedule=$(srcdir)/isolation_schedule prepared-transactions diff --git a/src/test/regress/GNUmakefile b/src/test/regress/GNUmakefile index 204099a6618..f5ed474d6e3 100644 --- a/src/test/regress/GNUmakefile +++ b/src/test/regress/GNUmakefile @@ -17,12 +17,6 @@ subdir = src/test/regress top_builddir = ../../.. include $(top_builddir)/src/Makefile.global -# file with extra config for temp build -TEMP_CONF = -ifdef TEMP_CONFIG -TEMP_CONF += --temp-config=$(TEMP_CONFIG) -endif - # maximum simultaneous connections for parallel tests MAXCONNOPT = ifdef MAX_CONNECTIONS @@ -131,10 +125,10 @@ tablespace-setup: REGRESS_OPTS = --dlpath=. $(EXTRA_REGRESS_OPTS) check: all tablespace-setup - $(pg_regress_check) $(REGRESS_OPTS) --schedule=$(srcdir)/parallel_schedule $(MAXCONNOPT) $(TEMP_CONF) $(EXTRA_TESTS) + $(pg_regress_check) $(REGRESS_OPTS) --schedule=$(srcdir)/parallel_schedule $(MAXCONNOPT) $(EXTRA_TESTS) check-tests: all tablespace-setup - $(pg_regress_check) $(REGRESS_OPTS) $(MAXCONNOPT) $(TEMP_CONF) $(TESTS) $(EXTRA_TESTS) + $(pg_regress_check) $(REGRESS_OPTS) $(MAXCONNOPT) $(TESTS) $(EXTRA_TESTS) installcheck: all tablespace-setup $(pg_regress_installcheck) $(REGRESS_OPTS) --schedule=$(srcdir)/serial_schedule $(EXTRA_TESTS) |