From 2a6108ac247ed27f084a25269288a2818371aec1 Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Fri, 28 Nov 2008 23:47:51 +0000
Subject: [PATCH] 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.
---
src/interfaces/ecpg/test/Makefile | 6 +++---
src/tools/msvc/vcregress.pl | 7 +++----
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/src/interfaces/ecpg/test/Makefile b/src/interfaces/ecpg/test/Makefile
index eadf36d0def..21289a27ed1 100644
--- a/src/interfaces/ecpg/test/Makefile
+++ b/src/interfaces/ecpg/test/Makefile
@@ -1,4 +1,4 @@
-# $PostgreSQL: pgsql/src/interfaces/ecpg/test/Makefile,v 1.73 2008/10/21 10:51:24 petere Exp $
+# $PostgreSQL: pgsql/src/interfaces/ecpg/test/Makefile,v 1.74 2008/11/28 23:47:51 tgl Exp $
subdir = src/interfaces/ecpg/test
top_builddir = ../../../..
@@ -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 954e23e5ce1..9312e758c84 100644
--- a/src/tools/msvc/vcregress.pl
+++ b/src/tools/msvc/vcregress.pl
@@ -1,7 +1,7 @@
# -*-perl-*- hey - emacs - this is a perl file
-# $PostgreSQL: pgsql/src/tools/msvc/vcregress.pl,v 1.8 2008/10/06 02:55:20 tgl Exp $
+# $PostgreSQL: pgsql/src/tools/msvc/vcregress.pl,v 1.9 2008/11/28 23:47:51 tgl Exp $
use strict;
@@ -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);
--
GitLab