diff options
| author | Tom Lane | 2008-11-28 23:47:51 +0000 |
|---|---|---|
| committer | Tom Lane | 2008-11-28 23:47:51 +0000 |
| commit | 9420e83deb02811a48b57af2bcec4d3b7a196a24 (patch) | |
| tree | 69cd00f0eb3ecf5f37529a2fe6c7b73c62ad0b89 | |
| parent | 5f81bef9999a4796572d6ce1df00e98c7173c0f5 (diff) | |
Partial fix for fallout from temp-port changes. ecpg still needs more work,
but I think this is enough to turn the buildfarm green again.
| -rw-r--r-- | src/interfaces/ecpg/test/Makefile | 4 | ||||
| -rw-r--r-- | src/tools/msvc/vcregress.pl | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/interfaces/ecpg/test/Makefile b/src/interfaces/ecpg/test/Makefile index 8c34f06136..d11e710209 100644 --- a/src/interfaces/ecpg/test/Makefile +++ b/src/interfaces/ecpg/test/Makefile @@ -88,11 +88,11 @@ endif check: all - ./pg_regress --dbname=regress1,connectdb --top-builddir=$(top_builddir) --temp-install=./tmp_check --temp-port=$(TEMP_PORT) --multibyte=$(MULTIBYTE) --load-language=plpgsql $(NOLOCALE) $(THREAD) --schedule=$(srcdir)/ecpg_schedule --create-role=connectuser,connectdb + ./pg_regress --dbname=regress1,connectdb --top-builddir=$(top_builddir) --temp-install=./tmp_check --port=$(TEMP_PORT) --multibyte=$(MULTIBYTE) --load-language=plpgsql $(NOLOCALE) $(THREAD) --schedule=$(srcdir)/ecpg_schedule --create-role=connectuser,connectdb # the same options, but with --listen-on-tcp checktcp: all - ./pg_regress --dbname=regress1,connectdb --top-builddir=$(top_builddir) --temp-install=./tmp_check --temp-port=$(TEMP_PORT) --multibyte=$(MULTIBYTE) --load-language=plpgsql $(NOLOCALE) $(THREAD) --schedule=$(srcdir)/ecpg_schedule_tcp --create-role=connectuser,connectdb --host=localhost + ./pg_regress --dbname=regress1,connectdb --top-builddir=$(top_builddir) --temp-install=./tmp_check --port=$(TEMP_PORT) --multibyte=$(MULTIBYTE) --load-language=plpgsql $(NOLOCALE) $(THREAD) --schedule=$(srcdir)/ecpg_schedule_tcp --create-role=connectuser,connectdb --host=localhost installcheck: all ./pg_regress --psqldir=$(PSQLDIR) --dbname=regress1,connectdb --top-builddir=$(top_builddir) --multibyte=$(MULTIBYTE) --load-language=plpgsql $(NOLOCALE) $(THREAD) --schedule=$(srcdir)/ecpg_schedule --create-role=connectuser,connectdb diff --git a/src/tools/msvc/vcregress.pl b/src/tools/msvc/vcregress.pl index e083b874ed..27049c7306 100644 --- a/src/tools/msvc/vcregress.pl +++ b/src/tools/msvc/vcregress.pl @@ -119,8 +119,7 @@ sub check "--load-language=plpgsql", "--no-locale", "--temp-install=./tmp_check", - "--top-builddir=\"$topdir\"", - "--temp-port=$temp_port" + "--top-builddir=\"$topdir\"" ); push(@args,$maxconn) if $maxconn; push(@args,$temp_config) if $temp_config; @@ -148,7 +147,7 @@ sub ecpgcheck "--no-locale", "--temp-install=./tmp_chk", "--top-builddir=\"$topdir\"", - "--temp-port=$temp_port" + "--port=$temp_port" ); push(@args,$maxconn) if $maxconn; system(@args); |