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.

diff --git a/src/interfaces/ecpg/test/Makefile b/src/interfaces/ecpg/test/Makefile
index 8c34f06136bd93c0cbe8abc090e35ea180eb4dd5..d11e7102090fe77fc424f832a93fc7513a9e1537 100644 (file)
--- 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 e083b874edf1b8b8a66a339cf002181bcdbca1c0..27049c7306145d0f9a63fc6feb1a8ebfb9b1f078 100644 (file)
--- 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);