Testsuite: ignore fakens fork debug line, avoiding ipv6-support differences

1 files changed, 29 insertions, 75 deletions

diff --git a/test/stderr/2013 b/test/stderr/2013
index c25718713..070012d11 100644
--- a/test/stderr/2013
+++ b/test/stderr/2013
@@ -5,36 +5,28 @@ dropping to exim gid; retaining priv uid
 LOG: queue_run MAIN
   Start queue run: pid=pppp -qqf
 fresh-exec forking for qrun-delivery
-postfork: qrun-delivery
-qrun-delivery forking for transport
-postfork: transport
 fresh-exec forked for qrun-delivery: npppp
+qrun-delivery forking for transport
 qrun-delivery forked for transport: npppp
 >>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
 fresh-exec forking for qrun-delivery
-postfork: qrun-delivery
-qrun-delivery forking for transport
-postfork: transport
 fresh-exec forked for qrun-delivery: npppp
+qrun-delivery forking for transport
 qrun-delivery forked for transport: npppp
 >>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
 fresh-exec forking for qrun-delivery
-postfork: qrun-delivery
-qrun-delivery forking for transport
-postfork: transport
 fresh-exec forked for qrun-delivery: npppp
+qrun-delivery forking for transport
 qrun-delivery forked for transport: npppp
 >>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
 fresh-exec forking for qrun-delivery
-postfork: qrun-delivery
+fresh-exec forked for qrun-delivery: npppp
 qrun-delivery forking for transport
-postfork: transport
+qrun-delivery forked for transport: npppp
 Connecting to 127.0.0.1 [127.0.0.1]:1225 ...  connected
   SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
   SMTP>> EHLO myhost.test.ex
 cmd buf flush ddd bytes
-fresh-exec forked for qrun-delivery: npppp
-qrun-delivery forked for transport: npppp
   SMTP<< 250-myhost.test.ex Hello localhost [127.0.0.1]
          250-SIZE 52428800
          250-8BITMIME
@@ -60,16 +52,12 @@ cmd buf flush ddd bytes
   SMTP<< 354 Enter message, ending with "." on a line by itself
   SMTP<< 250 OK id=10HmbA-0005vi-00
 transport forking for continued-transport-interproc
-postfork: continued-transport-interproc
-continued-transport-interproc forking for continued-transport
-postfork: continued-transport
 transport forked for continued-transport-interproc: npppp
+continued-transport-interproc forking for continued-transport
 continued-transport-interproc forked for continued-transport: npppp
 transport forking for tls-proxy-interproc
-postfork: tls-proxy-interproc
-tls-proxy-interproc forking for tls-proxy
-postfork: tls-proxy
 transport forked for tls-proxy-interproc: npppp
+tls-proxy-interproc forking for tls-proxy
 tls-proxy-interproc forked for tls-proxy: npppp
 LOG: MAIN
   => userx@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="C=UK,O=The Exim Maintainers,OU=Test Suite,CN=Phil Pennock" C="250 OK id=10HmbA-0005vi-00"
@@ -82,7 +70,7 @@ trusted user
 admin user
 dropping to exim gid; retaining priv uid
 continued-transport forking for transport
-postfork: transport
+continued-transport forked for transport: npppp
   SMTP>> MAIL FROM:<CALLER@myhost.test.ex> SIZE=ssss
   SMTP>> RCPT TO:<userz@test.ex>
   SMTP>> DATA
@@ -92,11 +80,8 @@ cmd buf flush ddd bytes
   SMTP<< 354 Enter message, ending with "." on a line by itself
   SMTP<< 250 OK id=10HmbB-0005vi-00
 transport forking for continued-transport-interproc
-postfork: continued-transport-interproc
-continued-transport-interproc forking for continued-transport
-postfork: continued-transport
-continued-transport forked for transport: npppp
 transport forked for continued-transport-interproc: npppp
+continued-transport-interproc forking for continued-transport
 continued-transport-interproc forked for continued-transport: npppp
   SMTP(close)>>
 LOG: MAIN
@@ -110,7 +95,7 @@ trusted user
 admin user
 dropping to exim gid; retaining priv uid
 continued-transport forking for transport
-postfork: transport
+continued-transport forked for transport: npppp
   SMTP>> MAIL FROM:<CALLER@myhost.test.ex> SIZE=ssss
   SMTP>> RCPT TO:<usery@test.ex>
   SMTP>> DATA
@@ -122,7 +107,6 @@ cmd buf flush ddd bytes
   SMTP>> QUIT
 cmd buf flush ddd bytes
   SMTP(close)>>
-continued-transport forked for transport: npppp
 >>>>>>>>>>>>>>>> Exim pid=pppp (tls-proxy) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: MAIN
   => usery@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmbC-0005vi-00"
@@ -139,36 +123,28 @@ dropping to exim gid; retaining priv uid
 LOG: queue_run MAIN
   Start queue run: pid=pppp -qqf
 fresh-exec forking for qrun-delivery
-postfork: qrun-delivery
-qrun-delivery forking for transport
-postfork: transport
 fresh-exec forked for qrun-delivery: npppp
+qrun-delivery forking for transport
 qrun-delivery forked for transport: npppp
 >>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
 fresh-exec forking for qrun-delivery
-postfork: qrun-delivery
-qrun-delivery forking for transport
-postfork: transport
 fresh-exec forked for qrun-delivery: npppp
+qrun-delivery forking for transport
 qrun-delivery forked for transport: npppp
 >>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
 fresh-exec forking for qrun-delivery
-postfork: qrun-delivery
-qrun-delivery forking for transport
-postfork: transport
 fresh-exec forked for qrun-delivery: npppp
+qrun-delivery forking for transport
 qrun-delivery forked for transport: npppp
 >>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
 fresh-exec forking for qrun-delivery
-postfork: qrun-delivery
+fresh-exec forked for qrun-delivery: npppp
 qrun-delivery forking for transport
-postfork: transport
+qrun-delivery forked for transport: npppp
 Connecting to 127.0.0.1 [127.0.0.1]:1225 ...  connected
   SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
   SMTP>> EHLO myhost.test.ex
 cmd buf flush ddd bytes
-fresh-exec forked for qrun-delivery: npppp
-qrun-delivery forked for transport: npppp
   SMTP<< 250-myhost.test.ex Hello localhost [127.0.0.1]
          250-SIZE 52428800
          250-8BITMIME
@@ -194,16 +170,12 @@ cmd buf flush ddd bytes
   SMTP<< 354 Enter message, ending with "." on a line by itself
   SMTP<< 250 OK id=10HmbG-0005vi-00
 transport forking for continued-transport-interproc
-postfork: continued-transport-interproc
-continued-transport-interproc forking for continued-transport
-postfork: continued-transport
 transport forked for continued-transport-interproc: npppp
+continued-transport-interproc forking for continued-transport
 continued-transport-interproc forked for continued-transport: npppp
 transport forking for tls-proxy-interproc
-postfork: tls-proxy-interproc
-tls-proxy-interproc forking for tls-proxy
-postfork: tls-proxy
 transport forked for tls-proxy-interproc: npppp
+tls-proxy-interproc forking for tls-proxy
 tls-proxy-interproc forked for tls-proxy: npppp
 LOG: MAIN
   => usera@test.ex R=cl_override T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="C=UK,O=The Exim Maintainers,OU=Test Suite,CN=Phil Pennock" C="250 OK id=10HmbG-0005vi-00"
@@ -216,7 +188,7 @@ trusted user
 admin user
 dropping to exim gid; retaining priv uid
 continued-transport forking for transport
-postfork: transport
+continued-transport forked for transport: npppp
   SMTP>> MAIL FROM:<CALLER@myhost.test.ex> SIZE=ssss
   SMTP>> RCPT TO:<userc@test.ex>
   SMTP>> DATA
@@ -226,11 +198,8 @@ cmd buf flush ddd bytes
   SMTP<< 354 Enter message, ending with "." on a line by itself
   SMTP<< 250 OK id=10HmbH-0005vi-00
 transport forking for continued-transport-interproc
-postfork: continued-transport-interproc
-continued-transport-interproc forking for continued-transport
-postfork: continued-transport
-continued-transport forked for transport: npppp
 transport forked for continued-transport-interproc: npppp
+continued-transport-interproc forking for continued-transport
 continued-transport-interproc forked for continued-transport: npppp
   SMTP(close)>>
 LOG: MAIN
@@ -244,7 +213,7 @@ trusted user
 admin user
 dropping to exim gid; retaining priv uid
 continued-transport forking for transport
-postfork: transport
+continued-transport forked for transport: npppp
   SMTP>> MAIL FROM:<CALLER@myhost.test.ex> SIZE=ssss
   SMTP>> RCPT TO:<userb@test.ex>
   SMTP>> DATA
@@ -256,7 +225,6 @@ cmd buf flush ddd bytes
   SMTP>> QUIT
 cmd buf flush ddd bytes
   SMTP(close)>>
-continued-transport forked for transport: npppp
 >>>>>>>>>>>>>>>> Exim pid=pppp (tls-proxy) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: MAIN
   => userb@test.ex R=cl_override T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmbI-0005vi-00"
@@ -273,36 +241,28 @@ dropping to exim gid; retaining priv uid
 LOG: queue_run MAIN
   Start queue run: pid=pppp -qqf
 fresh-exec forking for qrun-delivery
-postfork: qrun-delivery
-qrun-delivery forking for transport
-postfork: transport
 fresh-exec forked for qrun-delivery: npppp
+qrun-delivery forking for transport
 qrun-delivery forked for transport: npppp
 >>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
 fresh-exec forking for qrun-delivery
-postfork: qrun-delivery
-qrun-delivery forking for transport
-postfork: transport
 fresh-exec forked for qrun-delivery: npppp
+qrun-delivery forking for transport
 qrun-delivery forked for transport: npppp
 >>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
 fresh-exec forking for qrun-delivery
-postfork: qrun-delivery
-qrun-delivery forking for transport
-postfork: transport
 fresh-exec forked for qrun-delivery: npppp
+qrun-delivery forking for transport
 qrun-delivery forked for transport: npppp
 >>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
 fresh-exec forking for qrun-delivery
-postfork: qrun-delivery
+fresh-exec forked for qrun-delivery: npppp
 qrun-delivery forking for transport
-postfork: transport
+qrun-delivery forked for transport: npppp
 Connecting to 127.0.0.1 [127.0.0.1]:1225 ...  connected
   SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
   SMTP>> EHLO myhost.test.ex
 cmd buf flush ddd bytes
-fresh-exec forked for qrun-delivery: npppp
-qrun-delivery forked for transport: npppp
   SMTP<< 250-myhost.test.ex Hello localhost [127.0.0.1]
          250-SIZE 52428800
          250-8BITMIME
@@ -336,10 +296,8 @@ cmd buf flush ddd bytes
          250-STARTTLS
          250 HELP
 transport forking for continued-transport-interproc
-postfork: continued-transport-interproc
-continued-transport-interproc forking for continued-transport
-postfork: continued-transport
 transport forked for continued-transport-interproc: npppp
+continued-transport-interproc forking for continued-transport
 continued-transport-interproc forked for continued-transport: npppp
   SMTP(close)>>
 LOG: MAIN
@@ -353,10 +311,9 @@ trusted user
 admin user
 dropping to exim gid; retaining priv uid
 continued-transport forking for transport
-postfork: transport
+continued-transport forked for transport: npppp
   SMTP>> STARTTLS
 cmd buf flush ddd bytes
-continued-transport forked for transport: npppp
   SMTP<< 220 TLS go ahead
   SMTP>> EHLO myhost.test.ex
 cmd buf flush ddd bytes
@@ -382,10 +339,8 @@ cmd buf flush ddd bytes
          250-STARTTLS
          250 HELP
 transport forking for continued-transport-interproc
-postfork: continued-transport-interproc
-continued-transport-interproc forking for continued-transport
-postfork: continued-transport
 transport forked for continued-transport-interproc: npppp
+continued-transport-interproc forking for continued-transport
 continued-transport-interproc forked for continued-transport: npppp
   SMTP(close)>>
 LOG: MAIN
@@ -399,10 +354,9 @@ trusted user
 admin user
 dropping to exim gid; retaining priv uid
 continued-transport forking for transport
-postfork: transport
+continued-transport forked for transport: npppp
   SMTP>> STARTTLS
 cmd buf flush ddd bytes
-continued-transport forked for transport: npppp
   SMTP<< 220 TLS go ahead
   SMTP>> EHLO myhost.test.ex
 cmd buf flush ddd bytes