From: Peter Eisentraut <peter@eisentraut.org>
Date: Fri, 2 Aug 2019 07:00:39 +0000 (+0200)
Subject: test: Add -w option to pg_ctl invocation
X-Git-Tag: pgbouncer_1_11_0~23
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=daf28ca493eddad2d734ff1422b2d9db1ce2dbf4;p=pgbouncer

test: Add -w option to pg_ctl invocation

This is the default in recent PostgreSQL versions.  This change just
makes the script behavior consistent across versions.  We can now also
remove some sleep calls to make the tests start faster.
---

diff --git a/test/ssl/test.sh b/test/ssl/test.sh
index a817e05..fb6c457 100755
--- a/test/ssl/test.sh
+++ b/test/ssl/test.sh
@@ -30,7 +30,7 @@ PG_PORT=6666
 PG_LOG=$LOGDIR/pg.log
 
 pgctl() {
-	pg_ctl -o "-p $PG_PORT" -D $PGDATA $@ >>$PG_LOG 2>&1
+	pg_ctl -w -o "-p $PG_PORT" -D $PGDATA $@ >>$PG_LOG 2>&1
 }
 
 ulimit -c unlimited
@@ -66,7 +66,6 @@ if [ ! -d $PGDATA ]; then
 fi
 
 pgctl start
-sleep 5
 
 echo "createdb"
 psql -X -p $PG_PORT -l | grep p0 > /dev/null || {
diff --git a/test/test.sh b/test/test.sh
index 4f3d43c..9847203 100755
--- a/test/test.sh
+++ b/test/test.sh
@@ -23,7 +23,7 @@ PG_PORT=6666
 PG_LOG=$LOGDIR/pg.log
 
 pgctl() {
-	pg_ctl -o "-p $PG_PORT" -D $PGDATA $@ >>$PG_LOG 2>&1
+	pg_ctl -w -o "-p $PG_PORT" -D $PGDATA $@ >>$PG_LOG 2>&1
 }
 
 ulimit -c unlimited
@@ -95,7 +95,6 @@ if [ ! -d $PGDATA ]; then
 fi
 
 pgctl start
-sleep 5
 
 echo "Creating databases"
 psql -X -p $PG_PORT -l | grep p0 > /dev/null || {