aboutsummaryrefslogtreecommitdiff
path: root/src/interfaces
diff options
context:
space:
mode:
authorAndrew Dunstan <andrew@dunslane.net>2016-02-27 12:28:21 -0500
committerAndrew Dunstan <andrew@dunslane.net>2016-02-27 12:28:21 -0500
commit87cc6b57a911bf439ff9e53f1eddba58e9749ffe (patch)
tree263500fc4b8a239b4105dd6adf0270acbf9505fc /src/interfaces
parentc9578135f769072e2597b88402f256a398279c91 (diff)
downloadpostgresql-87cc6b57a911bf439ff9e53f1eddba58e9749ffe.tar.gz
postgresql-87cc6b57a911bf439ff9e53f1eddba58e9749ffe.zip
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/interfaces')
-rw-r--r--src/interfaces/ecpg/test/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/interfaces/ecpg/test/Makefile b/src/interfaces/ecpg/test/Makefile
index a4ac02107c8..4ed785b7678 100644
--- a/src/interfaces/ecpg/test/Makefile
+++ b/src/interfaces/ecpg/test/Makefile
@@ -78,11 +78,11 @@ endif
REGRESS_OPTS = --dbname=regress1,connectdb --create-role=connectuser,connectdb $(EXTRA_REGRESS_OPTS)
check: all
- $(with_temp_install) ./pg_regress $(REGRESS_OPTS) --temp-instance=./tmp_check --bindir= $(pg_regress_locale_flags) $(THREAD) --schedule=$(srcdir)/ecpg_schedule
+ $(with_temp_install) ./pg_regress $(REGRESS_OPTS) --temp-instance=./tmp_check $(TEMP_CONF) --bindir= $(pg_regress_locale_flags) $(THREAD) --schedule=$(srcdir)/ecpg_schedule
# the same options, but with --listen-on-tcp
checktcp: all
- $(with_temp_install) ./pg_regress $(REGRESS_OPTS) --temp-instance=./tmp_check --bindir= $(pg_regress_locale_flags) $(THREAD) --schedule=$(srcdir)/ecpg_schedule_tcp --host=localhost
+ $(with_temp_install) ./pg_regress $(REGRESS_OPTS) --temp-instance=./tmp_check $(TEMP_CONF) --bindir= $(pg_regress_locale_flags) $(THREAD) --schedule=$(srcdir)/ecpg_schedule_tcp --host=localhost
installcheck: all
./pg_regress $(REGRESS_OPTS) --bindir='$(bindir)' $(pg_regress_locale_flags) $(THREAD) --schedule=$(srcdir)/ecpg_schedule