From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Wed, 27 Dec 2017 11:11:17 +0000 (+0000)
Subject: Testsuite: better portability of postgresq test vs. postgresql versions
X-Git-Tag: exim-4_91_RC1~134
X-Git-Url: https://git.exim.org/exim.git/commitdiff_plain/2b665c130a451eb5bfa7315ad6854b83db73d9a3

Testsuite: better portability of postgresq test vs. postgresql versions
---

diff --git a/test/scripts/2620-Postgresql/2620 b/test/scripts/2620-Postgresql/2620
index ba3a3bcc8..ae5dca130 100644
--- a/test/scripts/2620-Postgresql/2620
+++ b/test/scripts/2620-Postgresql/2620
@@ -5,20 +5,22 @@ sudo rm -fr DIR/pgsql
 perl
 system 'initdb -D DIR/pgsql/data';
 ****
+sudo rm test-stdout
 background
 /usr/bin/postgres -D DIR/pgsql/data -p PORT_N -k DIR/pgsql
 ****
+sleep 1
 perl
 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 );" \
- -c "INSERT INTO them VALUES ( \'Philip Hazel\', \'ph10\' );" \
- -c "INSERT INTO them VALUES ( \'Aristotle\',    \'aaaa\' );" \
- -c "INSERT INTO them VALUES ( \'\', \'nothing\' );" \
- -c "INSERT INTO them VALUES ( \'\"stquot\', \'quote2\' );" \
- -c "INSERT INTO them VALUES ( \'before\' || CHR(13) || CHR(10) || \'after\', \'newline\' );" \
- -c "INSERT INTO them VALUES ( \'x\' || CHR(9) || \'x\', \'tab\' );" \
- -c "INSERT INTO them VALUES ( CHR(39) || \'stquot\', \'quote1\' );" \
+ -c "CREATE TABLE them ( name text, id text ); \
+     INSERT INTO them VALUES ( \'Philip Hazel\', \'ph10\' ); \
+     INSERT INTO them VALUES ( \'Aristotle\',    \'aaaa\' ); \
+     INSERT INTO them VALUES ( \'\', \'nothing\' ); \
+     INSERT INTO them VALUES ( \'\"stquot\', \'quote2\' ); \
+     INSERT INTO them VALUES ( \'before\' || CHR(13) || CHR(10) || \'after\', \'newline\' ); \
+     INSERT INTO them VALUES ( \'x\' || CHR(9) || \'x\', \'tab\' ); \
+     INSERT INTO them VALUES ( CHR(39) || \'stquot\', \'quote1\' );" \
  ';
 ****
 #