Logging: pipelining log_selector

9 files changed, 28 insertions, 3 deletions

diff --git a/test/stderr/0143 b/test/stderr/0143
index e9db55adc..7bc35aaf1 100644
--- a/test/stderr/0143
+++ b/test/stderr/0143
@@ -33,9 +33,11 @@ cmd buf flush ddd bytes
   SMTP<< 250 Sender OK
   SMTP>> RCPT TO:<userx@domain.com>
 cmd buf flush ddd bytes
+sync_responses expect rcpt
   SMTP<< 250 Recipient OK
   SMTP>> DATA
 cmd buf flush ddd bytes
+sync_responses expect data
   SMTP<< 354 Send data
   SMTP>> writing message and terminating "."
 cannot use sendfile for body: spoolfile not wireformat
diff --git a/test/stderr/0218 b/test/stderr/0218
index 552b5682e..d04d54099 100644
--- a/test/stderr/0218
+++ b/test/stderr/0218
@@ -32,7 +32,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
   SMTP<< 250 OK
   SMTP(close)>>
 LOG: MAIN
-  => a@test.ex F=<CALLER@test.ex> R=client T=send_to_server H=127.0.0.1 [127.0.0.1] C="250 OK"
+  => a@test.ex F=<CALLER@test.ex> R=client T=send_to_server H=127.0.0.1 [127.0.0.1] L C="250 OK"
 LOG: MAIN
   Completed
 Exim version x.yz ....
@@ -53,7 +53,7 @@ T: send_to_server  (ACL)
   SMTP>> QUIT
   SMTP(close)>>
 LOG: MAIN
-  => b@test.ex F=<CALLER@test.ex> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK"
+  => b@test.ex F=<CALLER@test.ex> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* L C="250 OK"
 LOG: MAIN
   Completed
 >>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
@@ -179,7 +179,7 @@ T: send_to_server  (ACL)
   SMTP>> QUIT
   SMTP(close)>>
 LOG: MAIN
-  => c@test.ex F=<CALLER@test.ex> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK"
+  => c@test.ex F=<CALLER@test.ex> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* L C="250 OK"
 LOG: MAIN
   Completed
 >>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0398 b/test/stderr/0398
index 96cf8999d..9bec2572c 100644
--- a/test/stderr/0398
+++ b/test/stderr/0398
@@ -142,6 +142,7 @@ cmd buf flush ddd bytes
   SMTP<< 250 OK
   SMTP>> RCPT TO:<qq@remote>
 cmd buf flush ddd bytes
+sync_responses expect rcpt
   SMTP<< 550 Unknown
   SMTP>> QUIT
 cmd buf flush ddd bytes
diff --git a/test/stderr/0432 b/test/stderr/0432
index f74df091c..f8a9f8879 100644
--- a/test/stderr/0432
+++ b/test/stderr/0432
@@ -104,6 +104,7 @@ cmd buf flush ddd bytes
   SMTP<< 250 OK
   SMTP>> RCPT TO:<x@y>
 cmd buf flush ddd bytes
+sync_responses expect rcpt
   SMTP<< 250 OK
   SMTP>> QUIT
 cmd buf flush ddd bytes
diff --git a/test/stderr/0476 b/test/stderr/0476
index 49b49fc5a..da6484a39 100644
--- a/test/stderr/0476
+++ b/test/stderr/0476
@@ -31,8 +31,11 @@ not using DSN
   SMTP>> RCPT TO:<userx@test.ex>
   SMTP>> DATA
 cmd buf flush ddd bytes
+sync_responses expect mail
   SMTP<< 250 OK
+sync_responses expect rcpt
   SMTP<< 550 NO
+sync_responses expect data
   SMTP(closed)<<
 Remote host closed connection in response to pipelined DATA
 error for DATA ignored: pipelining is in use and there were no good recipients
diff --git a/test/stderr/2035 b/test/stderr/2035
index 132da6bc2..4f72f35c2 100644
--- a/test/stderr/2035
+++ b/test/stderr/2035
@@ -29,7 +29,9 @@ not using DSN
   SMTP>> MAIL FROM:<usera@ok.example>
   SMTP>> RCPT TO:<userb@test.ex>
 cmd buf flush ddd bytes
+sync_responses expect mail
   SMTP<< 250 OK
+sync_responses expect rcpt
   SMTP<< 250 Accepted
 LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local-smtp S=sss
@@ -56,6 +58,7 @@ Transport port=25 replaced by host-specific port=1225
 continued connection, proxied TLS
   SMTP>> DATA
 cmd buf flush ddd bytes
+sync_responses expect data
   SMTP<< 354 Enter message, ending with "." on a line by itself
   SMTP>> writing message and terminating "."
 cannot use sendfile for body: spoolfile not wireformat
diff --git a/test/stderr/2135 b/test/stderr/2135
index 432f1cf6c..db08f08a3 100644
--- a/test/stderr/2135
+++ b/test/stderr/2135
@@ -29,7 +29,9 @@ not using DSN
   SMTP>> MAIL FROM:<usera@ok.example>
   SMTP>> RCPT TO:<userb@test.ex>
 cmd buf flush ddd bytes
+sync_responses expect mail
   SMTP<< 250 OK
+sync_responses expect rcpt
   SMTP<< 250 Accepted
 LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local-smtp S=sss
@@ -56,6 +58,7 @@ Transport port=25 replaced by host-specific port=1225
 continued connection, proxied TLS
   SMTP>> DATA
 cmd buf flush ddd bytes
+sync_responses expect data
   SMTP<< 354 Enter message, ending with "." on a line by itself
   SMTP>> writing message and terminating "."
 cannot use sendfile for body: spoolfile not wireformat
diff --git a/test/stderr/5410 b/test/stderr/5410
index 946c48a2a..3946b8f07 100644
--- a/test/stderr/5410
+++ b/test/stderr/5410
@@ -122,7 +122,9 @@ not using DSN
   SMTP>> MAIL FROM:<CALLER@myhost.test.ex>
   SMTP>> RCPT TO:<userx@domain.com>
 cmd buf flush ddd bytes
+sync_responses expect mail
   SMTP<< 250 OK
+sync_responses expect rcpt
   SMTP<< 250 Accepted
 holding verify callout open for cutthrough delivery
 ----------- end cutthrough setup ------------
@@ -336,7 +338,9 @@ not using DSN
   SMTP>> MAIL FROM:<CALLER@myhost.test.ex>
   SMTP>> RCPT TO:<usery@domain.com>
 cmd buf flush ddd bytes
+sync_responses expect mail
   SMTP<< 250 OK
+sync_responses expect rcpt
   SMTP<< 250 Accepted
 holding verify callout open for cutthrough delivery
 ----------- end cutthrough setup ------------
@@ -550,7 +554,9 @@ not using DSN
   SMTP>> MAIL FROM:<CALLER@myhost.test.ex>
   SMTP>> RCPT TO:<usery@domain.com>
 cmd buf flush ddd bytes
+sync_responses expect mail
   SMTP<< 250 OK
+sync_responses expect rcpt
   SMTP<< 250 Accepted
 holding verify callout open for cutthrough delivery
 ----------- end cutthrough setup ------------
diff --git a/test/stderr/5420 b/test/stderr/5420
index 97af80b4f..817905992 100644
--- a/test/stderr/5420
+++ b/test/stderr/5420
@@ -121,7 +121,9 @@ not using DSN
   SMTP>> MAIL FROM:<CALLER@myhost.test.ex>
   SMTP>> RCPT TO:<userx@domain.com>
 cmd buf flush ddd bytes
+sync_responses expect mail
   SMTP<< 250 OK
+sync_responses expect rcpt
   SMTP<< 250 Accepted
 holding verify callout open for cutthrough delivery
 ----------- end cutthrough setup ------------
@@ -335,7 +337,9 @@ not using DSN
   SMTP>> MAIL FROM:<CALLER@myhost.test.ex>
   SMTP>> RCPT TO:<usery@domain.com>
 cmd buf flush ddd bytes
+sync_responses expect mail
   SMTP<< 250 OK
+sync_responses expect rcpt
   SMTP<< 250 Accepted
 holding verify callout open for cutthrough delivery
 ----------- end cutthrough setup ------------
@@ -549,7 +553,9 @@ not using DSN
   SMTP>> MAIL FROM:<CALLER@myhost.test.ex>
   SMTP>> RCPT TO:<usery@domain.com>
 cmd buf flush ddd bytes
+sync_responses expect mail
   SMTP<< 250 OK
+sync_responses expect rcpt
   SMTP<< 250 Accepted
 holding verify callout open for cutthrough delivery
 ----------- end cutthrough setup ------------