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 a817e05c922935da27e67d62192890454a544a5b..fb6c457c709a2bf0ce22a1a133e519aed2c13ad1 100755 (executable)
--- 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 4f3d43cc73b17034f59f21925138f1a76bf8a35e..98472031ff6a17f85a6e582b2a420192296d9b11 100755 (executable)
--- 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 || {