postgres.git / summary / log / commit / refs

commit    78a5e738e97b4dda89e1bfea60675bcf15f25994
Author:   Tom Lane <tgl@sss.pgh.pa.us>
Date:     Thu Jan 03 23:34:51 2013 +0000
First released in: 9.3.0, 9.2.3

    Prevent creation of postmaster's TCP socket during pg_upgrade testing.
    
    On non-Windows machines, we use the Unix socket for connections to test
    postmasters, so there is no need to create a TCP socket.  Furthermore,
    doing so causes failures due to port conflicts if two builds are carried
    out concurrently on one machine.  (If the builds are done in different
    chroots, which is standard practice at least in Red Hat distros, there
    is no risk of conflict on the Unix socket.)  Suppressing the TCP socket
    by setting listen_addresses to empty has long been standard practice
    for pg_regress, and pg_upgrade knows about this too ... but pg_upgrade's
    test.sh didn't get the memo.
    
    Back-patch to 9.2, and also sync the 9.2 version of the script with HEAD
    as much as practical.


 contrib/pg_upgrade/test.sh | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/contrib/pg_upgrade/test.sh b/contrib/pg_upgrade/test.sh
index 10b61573a30..7b87784149b 100644
--- a/contrib/pg_upgrade/test.sh
+++ b/contrib/pg_upgrade/test.sh
@@ -17,6 +17,13 @@ export PGPORT
 
 testhost=`uname -s`
 
+case $testhost in
+	MINGW*)	LISTEN_ADDRESSES="localhost" ;;
+	*)		LISTEN_ADDRESSES="" ;;
+esac
+
+POSTMASTER_OPTS="-F -c listen_addresses=$LISTEN_ADDRESSES"
+
 temp_root=$PWD/tmp_check
 
 if [ "$1" = '--install' ]; then
@@ -75,7 +82,7 @@ mkdir "$logdir"
 set -x
 
 $oldbindir/initdb -N
-$oldbindir/pg_ctl start -l "$logdir/postmaster1.log" -o '-F' -w
+$oldbindir/pg_ctl start -l "$logdir/postmaster1.log" -o "$POSTMASTER_OPTS" -w
 if "$MAKE" -C "$oldsrc" installcheck; then
 	pg_dumpall -f "$temp_root"/dump1.sql || pg_dumpall1_status=$?
 	if [ "$newsrc" != "$oldsrc" ]; then
@@ -118,7 +125,7 @@ initdb -N
 
 pg_upgrade -d "${PGDATA}.old" -D "${PGDATA}" -b "$oldbindir" -B "$bindir"
 
-pg_ctl start -l "$logdir/postmaster2.log" -o '-F' -w
+pg_ctl start -l "$logdir/postmaster2.log" -o "$POSTMASTER_OPTS" -w
 
 case $testhost in
 	MINGW*)	cmd /c analyze_new_cluster.bat ;;


[parent: b0daba57bb50]