database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-28 23:42:10 +03:00
Code Activity

Instead of waiting a fixed amount of time for the test postmaster to

Browse Source 
start up, wait until a psql connection attempt succeeds.  Per gripe
from Jason Tishler.
This commit is contained in:
Tom Lane
2002-01-03 21:52:05 +00:00
parent 0e3793e621
commit d02f0aaa3b
1 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,5 @@
#! /bin/sh #! /bin/sh
# $Header: /cvsroot/pgsql/src/test/regress/Attic/pg_regress.sh,v 1.22 2001/09/16 16:11:11 petere Exp $ # $Header: /cvsroot/pgsql/src/test/regress/Attic/pg_regress.sh,v 1.23 2002/01/03 21:52:05 tgl Exp $
me=`basename $0` me=`basename $0`
: ${TMPDIR=/tmp} : ${TMPDIR=/tmp}
@ -353,6 +353,27 @@ then
"$bindir/postmaster" -D "$PGDATA" -F $postmaster_options >"$LOGDIR/postmaster.log" 2>&1 & "$bindir/postmaster" -D "$PGDATA" -F $postmaster_options >"$LOGDIR/postmaster.log" 2>&1 &
postmaster_pid=$! postmaster_pid=$!
# Wait till postmaster is able to accept connections (normally only
# a second or so, but Cygwin is reportedly *much* slower). Don't
# wait forever, however.
i=0
max=60
until "$bindir/psql" $psql_options template1 </dev/null 2>/dev/null
do
i=`expr $i + 1`
if [ $i -ge $max ]
then
break
fi
if kill -0 $postmaster_pid >/dev/null 2>&1
then
: still starting up
else
break
fi
sleep 1
done
if kill -0 $postmaster_pid >/dev/null 2>&1 if kill -0 $postmaster_pid >/dev/null 2>&1
then then
echo "running on port $PGPORT with pid $postmaster_pid" echo "running on port $PGPORT with pid $postmaster_pid"
@ -364,9 +385,6 @@ then
(exit 2); exit (exit 2); exit
fi fi
# give postmaster some time to pass WAL recovery
sleep 3
else # not temp-install else # not temp-install
# If Unix sockets are not available, use the local host by default. # If Unix sockets are not available, use the local host by default.