Fix non-WITH_CONTENT_SCAN build (2)

[exim.git] / test / stdout / 2620

diff --git a/test/stdout/2620 b/test/stdout/2620
index c76e65085d69ce2885fbc54982e9701bf953dea1..13020359ae5dff51c50ae717eda478600ff71617 100644 (file)
--- a/test/stdout/2620
+++ b/test/stdout/2620
@@ -9,24 +9,22 @@ Data page checksums are disabled.
 
 creating directory TESTSUITE/pgsql/data ... ok
 creating subdirectories ... ok
 
 creating directory TESTSUITE/pgsql/data ... ok
 creating subdirectories ... ok

+selecting dynamic shared memory implementation ... posix

 selecting default max_connections ... 100
 selecting default shared_buffers ... 128MB
 selecting default max_connections ... 100
 selecting default shared_buffers ... 128MB

-selecting dynamic shared memory implementation ... posix
+selecting default time zone ... Europe/London

 creating configuration files ... ok
 running bootstrap script ... ok
 performing post-bootstrap initialization ... ok
 syncing data to disk ... ok
 
 creating configuration files ... ok
 running bootstrap script ... ok
 performing post-bootstrap initialization ... ok
 syncing data to disk ... ok
 

+

 Success. You can now start the database server using:
 
 Success. You can now start the database server using:
 

-    pg_ctl -D TESTSUITE/pgsql/data -l logfile start
+    TESTSUITE/bin.sys/pg_ctl -D TESTSUITE/pgsql/data -l logfile start

 
 

-CREATE TABLE
-INSERT 0 1
-INSERT 0 1
-INSERT 0 1
-INSERT 0 1
-INSERT 0 1
+pg_ctl: server is running (PID: p1234)
+POSTGRES "-D" "TESTSUITE/pgsql/data" "-p" "1223" "-k" "TESTSUITE/pgsql"

 INSERT 0 1
 > Philip Hazel
 > Philip Hazel
 INSERT 0 1
 > Philip Hazel
 > Philip Hazel


@@ -43,6 +41,12 @@ after" id=newline
 > Philip Hazel
 > Philip Hazel
 > Philip Hazel
 > Philip Hazel
 > Philip Hazel
 > Philip Hazel

+> x
+> Philip Hazel
+Aristotle
+> name="Philip Hazel" id=ph10 
+name=Aristotle id=aaaa 
+> 1

 > 
 
 **** SMTP testing session as if from host 10.0.0.0
 > 
 
 **** SMTP testing session as if from host 10.0.0.0


@@ -50,6 +54,7 @@ after" id=newline
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [10.0.0.0]\r

 250 OK\r
 550 relay not permitted\r
 550 relay not permitted\r
 250 OK\r
 550 relay not permitted\r
 550 relay not permitted\r