NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commitd0f312e

committed

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

port number, and use a default value for it that is dependent on theconfiguration-time DEF_PGPORT. Should make the world safe for runningparallel 'make check' in different branches. Back-patch as far as 7.4so that this actually is useful.

1 parent59857b4 commitd0f312eCopy full SHA for d0f312e

File tree

2 files changed

+19

-5

lines changed

src/test/regress
- GNUmakefile
- pg_regress.sh

2 files changed

+19

-5

lines changed

`‎src/test/regress/GNUmakefile‎`

Lines changed: 6 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`#`
`8`	`8`	`#`
`9`	`9`	`# IDENTIFICATION`
`10`		`-# $PostgreSQL: pgsql/src/test/regress/GNUmakefile,v 1.49 2005/05/11 21:52:03 tgl Exp $`
	`10`	`+# $PostgreSQL: pgsql/src/test/regress/GNUmakefile,v 1.50 2005/07/17 18:28:45 tgl Exp $`
`11`	`11`	`#`
`12`	`12`	`#-------------------------------------------------------------------------`
`13`	`13`
`@@ -22,6 +22,9 @@ override CFLAGS += $(CFLAGS_SL)`
`22`	`22`
`23`	`23`	`SHLIB_LINK =$(BE_DLLLIBS)`
`24`	`24`
	`25`	`+# port number for temp-installation test postmaster`
	`26`	`+TEMP_PORT = 5$(DEF_PGPORT)`
	`27`	`+`
`25`	`28`	`# default encoding`
`26`	`29`	`MULTIBYTE = SQL_ASCII`
`27`	`30`
`@@ -130,7 +133,7 @@ all-spi:`
`130`	`133`	`check: all`
`131`	`134`	`-rm -rf ./testtablespace`
`132`	`135`	`mkdir ./testtablespace`
`133`		`-$(SHELL) ./pg_regress --temp-install --top-builddir=$(top_builddir) --schedule=$(srcdir)/parallel_schedule --multibyte=$(MULTIBYTE) --load-language=plpgsql$(MAXCONNOPT)`
	`136`	`+$(SHELL) ./pg_regress --temp-install --top-builddir=$(top_builddir) --temp-port=$(TEMP_PORT) --schedule=$(srcdir)/parallel_schedule --multibyte=$(MULTIBYTE) --load-language=plpgsql$(MAXCONNOPT)`
`134`	`137`
`135`	`138`	`installcheck: all`
`136`	`139`	`-rm -rf ./testtablespace`
`@@ -153,7 +156,7 @@ bigtest:`
`153`	`156`	`$(SHELL) ./pg_regress --schedule=$(srcdir)/serial_schedule --multibyte=$(MULTIBYTE) --load-language=plpgsql numeric_big`
`154`	`157`
`155`	`158`	`bigcheck:`
`156`		`-$(SHELL) ./pg_regress --temp-install --top-builddir=$(top_builddir) --schedule=$(srcdir)/parallel_schedule --multibyte=$(MULTIBYTE) --load-language=plpgsql$(MAXCONNOPT) numeric_big`
	`159`	`+$(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`
`157`	`160`
`158`	`161`
`159`	`162`	`##`

`‎src/test/regress/pg_regress.sh‎`

Lines changed: 13 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`#! /bin/sh`
`2`		`-# $PostgreSQL: pgsql/src/test/regress/pg_regress.sh,v 1.58 2005/06/25 23:04:06 tgl Exp $`
	`2`	`+# $PostgreSQL: pgsql/src/test/regress/pg_regress.sh,v 1.59 2005/07/17 18:28:45 tgl Exp $`
`3`	`3`
`4`	`4`	me=`basename$0`
`5`	`5`	`:${TMPDIR=/tmp}`
`@@ -27,6 +27,7 @@ Options:`
`27`	`27`
`28`	`28`	Options for\`temp-install' mode:
`29`	`29`	`--top-builddir=DIR (relative) path to top level build directory`
	`30`	`+ --temp-port=PORT port number to start temp postmaster on`
`30`	`31`
`31`	`32`	`Options for using an existing installation:`
`32`	`33`	`--host=HOST use postmaster running on HOST`
`@@ -106,6 +107,7 @@ unset multibyte`
`106`	`107`	`dbname=regression`
`107`	`108`	`hostname=localhost`
`108`	`109`	`maxconnections=0`
	`110`	`+temp_port=65432`
`109`	`111`	`load_langs=""`
`110`	`112`
`111`	`113`	`:${GMAKE='@GMAKE@'}`
`@@ -160,6 +162,9 @@ do`
`160`	`162`	`--top-builddir=*)`
`161`	`163`	top_builddir=`expr"x$1":"x--top-builddir=$.*$"`
`162`	`164`	`shift;;`
	`165`	`+ --temp-port=*)`
	`166`	+ temp_port=`expr"x$1":"x--temp-port=$.*$"`
	`167`	`+shift;;`
`163`	`168`	`--host=*)`
`164`	`169`	PGHOST=`expr"x$1":"x--host=$.*$"`
`165`	`170`	`export PGHOST`
`@@ -342,7 +347,13 @@ then`
`342`	`347`	`unset PGHOST`
`343`	`348`	`unset PGHOSTADDR`
`344`	`349`	`fi`
`345`		`- PGPORT=65432`
	`350`	`+`
	`351`	`+# since Makefile isn't very bright, check for out-of-range temp_port`
	`352`	`+if ["$temp_port"-ge 1024-a"$temp_port"-le 65535 ];then`
	`353`	`+PGPORT=$temp_port`
	`354`	`+else`
	`355`	`+PGPORT=65432`
	`356`	`+fi`
`346`	`357`	`export PGPORT`
`347`	`358`
`348`	`359`	`# Get rid of environment stuff that might cause psql to misbehave`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitd0f312e

File tree

2 files changed

2 files changed

`‎src/test/regress/GNUmakefile‎`

`‎src/test/regress/pg_regress.sh‎`

0 commit comments