[exim-cvs] Testsuite: avoid munge false-pos spotting a new P…

Gitweb: https://git.exim.org/exim.git/commitdiff/2b019b1e3a01f0aa8794807d9c7e2a14df1e48b9

Commit:     2b019b1e3a01f0aa8794807d9c7e2a14df1e48b9
Parent:     c7bec9723a721f566c67df0a526e4de18b723659
Author:     Jeremy Harris <jgh146exb@???>
AuthorDate: Tue Dec 20 20:31:58 2022 +0000
Committer:  Jeremy Harris <jgh146exb@???>
CommitDate: Wed Dec 21 10:28:41 2022 +0000

    Testsuite: avoid munge false-pos spotting a new PID
---
 test/runtest     | 4 ++--
 test/stderr/0623 | 8 ++++----
 test/stderr/0911 | 8 ++++----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/test/runtest b/test/runtest
index 3cc534c98..38e03b3ac 100755
--- a/test/runtest
+++ b/test/runtest
@@ -342,7 +342,7 @@ return @yield;
# into the same standard values throughout the data from a single test.
# Message ids get this treatment (can't be made reliable for times), and
# times in dumped retry databases are also handled in a special way, as are
-# incoming port numbers.
+# incoming port numbers and PIDs.

 # On entry to the subroutine, the file to write to is already opened with the
 # name MUNGED. The input file name is the only argument to the subroutine.
@@ -1077,7 +1077,7 @@ RESET_AFTER_EXTRA_LINE_READ:
           /x;

     # Lines with a leading pid
-    s/^(\d+)\s(?!(?:previous message|in\s))/new_value($1, "p%s", \$next_pid) . ' '/e;
+    s/^(\d+)\s(?!(?:previous message|in\s|bytes remain in))/new_value($1, "p%s", \$next_pid) . ' '/e;

     # Debugging lines for Exim terminations and process-generation

diff --git a/test/stderr/0623 b/test/stderr/0623
index 32d19297f..cc9c3dcf9 100644
--- a/test/stderr/0623
+++ b/test/stderr/0623
@@ -126,8 +126,8 @@ LOG: MAIN
permreject@???: error ignored
LOG: MAIN
Completed
->>>>>>>>>>>>>>>> Exim pid=p1238 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=p1237 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1237 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
@@ -192,5 +192,5 @@ all IP addresses skipped or deferred at least one address
Leaving send_to_server transport
LOG: MAIN
== permreject@??? R=client T=send_to_server defer (-18) H=127.0.0.1 [127.0.0.1]: Remote host closed connection in response to end of data
->>>>>>>>>>>>>>>> Exim pid=p1240 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=p1239 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1239 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1238 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0911 b/test/stderr/0911
index 63b3037a7..b6ff35cca 100644
--- a/test/stderr/0911
+++ b/test/stderr/0911
@@ -264,10 +264,10 @@ LOG: MAIN
permreject@???: error ignored
LOG: MAIN
Completed
->>>>>>>>>>>>>>>> Exim pid=p1242 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1241 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
LOG: smtp_connection MAIN
SMTP connection from root closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=p1241 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1240 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
@@ -334,7 +334,7 @@ all IP addresses skipped or deferred at least one address
Leaving send_to_server transport
LOG: MAIN
== dataloss@??? R=client T=send_to_server defer (-18) H=127.0.0.1 [127.0.0.1]: Remote host closed connection in response to pipelined end of data
->>>>>>>>>>>>>>>> Exim pid=p1244 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1243 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
LOG: smtp_connection MAIN
SMTP connection from root closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=p1243 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1242 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>