From 29ebef639e8662c486271279705021fe8dde04c2 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Thu, 3 Jan 2002 21:52:05 +0000 Subject: [PATCH] Instead of waiting a fixed amount of time for the test postmaster to start up, wait until a psql connection attempt succeeds. Per gripe from Jason Tishler. --- src/test/regress/pg_regress.sh | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/src/test/regress/pg_regress.sh b/src/test/regress/pg_regress.sh index 591b34c225..ae4e7a1315 100644 --- a/src/test/regress/pg_regress.sh +++ b/src/test/regress/pg_regress.sh @@ -353,6 +353,27 @@ then "$bindir/postmaster" -D "$PGDATA" -F $postmaster_options >"$LOGDIR/postmaster.log" 2>&1 & 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 + 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 then echo "running on port $PGPORT with pid $postmaster_pid" @@ -364,9 +385,6 @@ then (exit 2); exit fi - # give postmaster some time to pass WAL recovery - sleep 3 - else # not temp-install # If Unix sockets are not available, use the local host by default. -- 2.39.5