Testsuite: when generating a bounce message, allow time for exec to run before before...

This is to keep debug output in similar order on different platforms

diff --git a/src/src/child.c b/src/src/child.c
index 1407b3718cea54aa830736399428732e809b8967..948e0d66928dfb26ed96982c94815ef5950684dc 100644 (file)
--- a/src/src/child.c
+++ b/src/src/child.c
@@ -269,6 +269,8 @@ if (pid == 0)
     }
   }
 
+testharness_pause_ms(100); /* let child work even longer, for exec */
+
 /* Parent process. Save fork() errno and close the reading end of the stdin
 pipe. */
 

diff --git a/test/stderr/0476 b/test/stderr/0476
index 391c13b594fe586824774c3cd8fe6d2d11888904..52fe40ae87c3ae368fc8521a85493d3017d2eb32 100644 (file)
--- a/test/stderr/0476
+++ b/test/stderr/0476
@@ -57,13 +57,13 @@ set_process_info: pppp delivering 10HmaX-0005vi-00
 LOG: MAIN
   ** userx@test.ex R=r1 T=t1 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<userx@test.ex>: 550 NO
 set_process_info: pppp tidying up after delivering 10HmaX-0005vi-00
-cannot use sendfile for body: spoolfile not wireformat
-writing data block fd=dddd size=sss timeout=0
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
 set_process_info: pppp accepting a local non-SMTP message from <>
+cannot use sendfile for body: spoolfile not wireformat
+writing data block fd=dddd size=sss timeout=0
 LOG: MAIN
   <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss
 Exim version x.yz ....

diff --git a/test/stderr/0512 b/test/stderr/0512
index aad48628053c9b8a87aa0910346ed2ea2c8608a9..56971b680aa7d7c62cbdd9fc2c65176309ca1b95 100644 (file)
--- a/test/stderr/0512
+++ b/test/stderr/0512
@@ -61,12 +61,12 @@ LOG: MAIN
   == userx@myhost.test.ex R=r1 T=t1 defer (dd): Connection refused
 LOG: MAIN
   ** userx@myhost.test.ex: retry timeout exceeded
-cannot use sendfile for body: spoolfile not wireformat
-writing data block fd=dddd size=sss timeout=0
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
+cannot use sendfile for body: spoolfile not wireformat
+writing data block fd=dddd size=sss timeout=0
 LOG: MAIN
   <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss
 Exim version x.yz ....
@@ -129,12 +129,12 @@ LOG: MAIN
   == userx@myhost.test.ex R=r1 T=t1 defer (dd): Connection refused
 LOG: MAIN
   ** userx@myhost.test.ex: retry timeout exceeded
-cannot use sendfile for body: spoolfile not wireformat
-writing data block fd=dddd size=sss timeout=0
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
+cannot use sendfile for body: spoolfile not wireformat
+writing data block fd=dddd size=sss timeout=0
 LOG: MAIN
   <= <> R=10HmaZ-0005vi-00 U=EXIMUSER P=local S=sss
 Exim version x.yz ....