mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make pg_regress accept a command-line option for the temporary installation's

Browse Source 
port number, and use a default value for it that is dependent on the
configuration-time DEF_PGPORT.  Should make the world safe for running
parallel 'make check' in different branches.  Back-patch as far as 7.4
so that this actually is useful.
This commit is contained in:
Tom Lane 2005-07-17 18:28:45 +00:00
parent 59857b46a8
commit d0f312ebfe
2 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/test/regress/GNUmakefile
View File

@ -7,7 +7,7 @@
# #
# #
# IDENTIFICATION # IDENTIFICATION
# $PostgreSQL: pgsql/src/test/regress/GNUmakefile,v 1.49 2005/05/11 21:52:03 tgl Exp $ # $PostgreSQL: pgsql/src/test/regress/GNUmakefile,v 1.50 2005/07/17 18:28:45 tgl Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
@ -22,6 +22,9 @@ override CFLAGS += $(CFLAGS_SL)
SHLIB_LINK = $(BE_DLLLIBS) SHLIB_LINK = $(BE_DLLLIBS)
# port number for temp-installation test postmaster
TEMP_PORT = 5$(DEF_PGPORT)
# default encoding # default encoding
MULTIBYTE = SQL_ASCII MULTIBYTE = SQL_ASCII
@ -130,7 +133,7 @@ all-spi:
check: all check: all
-rm -rf ./testtablespace -rm -rf ./testtablespace
mkdir ./testtablespace mkdir ./testtablespace
$(SHELL) ./pg_regress --temp-install --top-builddir=$(top_builddir) --schedule=$(srcdir)/parallel_schedule --multibyte=$(MULTIBYTE) --load-language=plpgsql $(MAXCONNOPT) $(SHELL) ./pg_regress --temp-install --top-builddir=$(top_builddir) --temp-port=$(TEMP_PORT) --schedule=$(srcdir)/parallel_schedule --multibyte=$(MULTIBYTE) --load-language=plpgsql $(MAXCONNOPT)
installcheck: all installcheck: all
-rm -rf ./testtablespace -rm -rf ./testtablespace
@ -153,7 +156,7 @@ bigtest:
$(SHELL) ./pg_regress --schedule=$(srcdir)/serial_schedule --multibyte=$(MULTIBYTE) --load-language=plpgsql numeric_big $(SHELL) ./pg_regress --schedule=$(srcdir)/serial_schedule --multibyte=$(MULTIBYTE) --load-language=plpgsql numeric_big
bigcheck: bigcheck:
$(SHELL) ./pg_regress --temp-install --top-builddir=$(top_builddir) --schedule=$(srcdir)/parallel_schedule --multibyte=$(MULTIBYTE) --load-language=plpgsql $(MAXCONNOPT) numeric_big $(SHELL) ./pg_regress --temp-install --top-builddir=$(top_builddir) --temp-port=$(TEMP_PORT) --schedule=$(srcdir)/parallel_schedule --multibyte=$(MULTIBYTE) --load-language=plpgsql $(MAXCONNOPT) numeric_big
## ##

15
src/test/regress/pg_regress.sh
View File

@ -1,5 +1,5 @@
#! /bin/sh #! /bin/sh
# $PostgreSQL: pgsql/src/test/regress/pg_regress.sh,v 1.58 2005/06/25 23:04:06 tgl Exp $ # $PostgreSQL: pgsql/src/test/regress/pg_regress.sh,v 1.59 2005/07/17 18:28:45 tgl Exp $
me=`basename $0` me=`basename $0`
: ${TMPDIR=/tmp} : ${TMPDIR=/tmp}
@ -27,6 +27,7 @@ Options:
Options for \`temp-install' mode: Options for \`temp-install' mode:
--top-builddir=DIR (relative) path to top level build directory --top-builddir=DIR (relative) path to top level build directory
--temp-port=PORT port number to start temp postmaster on
Options for using an existing installation: Options for using an existing installation:
--host=HOST use postmaster running on HOST --host=HOST use postmaster running on HOST
@ -106,6 +107,7 @@ unset multibyte
dbname=regression dbname=regression
hostname=localhost hostname=localhost
maxconnections=0 maxconnections=0
temp_port=65432
load_langs="" load_langs=""
: ${GMAKE='@GMAKE@'} : ${GMAKE='@GMAKE@'}
@ -160,6 +162,9 @@ do
--top-builddir=*) --top-builddir=*)
top_builddir=`expr "x$1" : "x--top-builddir=\(.*\)"` top_builddir=`expr "x$1" : "x--top-builddir=\(.*\)"`
shift;; shift;;
--temp-port=*)
temp_port=`expr "x$1" : "x--temp-port=\(.*\)"`
shift;;
--host=*) --host=*)
PGHOST=`expr "x$1" : "x--host=\(.*\)"` PGHOST=`expr "x$1" : "x--host=\(.*\)"`
export PGHOST export PGHOST
@ -342,7 +347,13 @@ then
unset PGHOST unset PGHOST
unset PGHOSTADDR unset PGHOSTADDR
fi fi
PGPORT=65432
# since Makefile isn't very bright, check for out-of-range temp_port
if [ "$temp_port" -ge 1024 -a "$temp_port" -le 65535 ] ; then
PGPORT=$temp_port
else
PGPORT=65432
fi
export PGPORT export PGPORT
# Get rid of environment stuff that might cause psql to misbehave # Get rid of environment stuff that might cause psql to misbehave