Avoid manually-counted long strings

[users/heiko/exim.git] / test / scripts / 2620-Postgresql / 2620

diff --git a/test/scripts/2620-Postgresql/2620 b/test/scripts/2620-Postgresql/2620
index 1f8f3abe1b707912d2ca2b82b06e92940775904c..a96b719308a1f5b67f4073788978d1bd6556d8b7 100644 (file)
--- a/test/scripts/2620-Postgresql/2620
+++ b/test/scripts/2620-Postgresql/2620
@@ -4,6 +4,7 @@
 #
 # first, populate a DB to test against
 sudo rm -fr DIR/pgsql
 #
 # first, populate a DB to test against
 sudo rm -fr DIR/pgsql

+echo Starting DB server

 perl
 system 'DIR/bin.sys/initdb -D DIR/pgsql/data';
 ****
 perl
 system 'DIR/bin.sys/initdb -D DIR/pgsql/data';
 ****


@@ -12,7 +13,9 @@ background
 DIR/bin.sys/postgres -D DIR/pgsql/data -p PORT_N -k DIR/pgsql
 ****
 sleep 1
 DIR/bin.sys/postgres -D DIR/pgsql/data -p PORT_N -k DIR/pgsql
 ****
 sleep 1

+echo Waiting for DB server

 perl
 perl

+system 'DIR/bin.sys/pg_ctl -w -D DIR/pgsql/data status';

 system 'createdb -h localhost -p PORT_N test';
 system 'psql -h localhost -p PORT_N -d test \
  -c "CREATE TABLE them ( name text, id text ); \
 system 'createdb -h localhost -p PORT_N test';
 system 'psql -h localhost -p PORT_N -d test \
  -c "CREATE TABLE them ( name text, id text ); \


@@ -25,6 +28,7 @@ system 'psql -h localhost -p PORT_N -d test \
      INSERT INTO them VALUES ( CHR(39) || \'stquot\', \'quote1\' );" \
  ';
 ****
      INSERT INTO them VALUES ( CHR(39) || \'stquot\', \'quote1\' );" \
  ';
 ****

+echo Populated DB server

 #
 # now, the tests
 exim -d-all+lookup -be
 #
 # now, the tests
 exim -d-all+lookup -be


@@ -62,7 +66,8 @@ ${lookup pgsql {select name from them where id='ph10';}}
 ****
 #
 perl
 ****
 #
 perl

-system 'pg_ctl stop -D DIR/pgsql/data -m immediate';
+system 'DIR/bin.sys/pg_ctl stop -D DIR/pgsql/data -m immediate';

 ****
 ****

+sleep 2

 killdaemon
 sudo rm -fr DIR/pgsql
 killdaemon
 sudo rm -fr DIR/pgsql