summaryrefslogtreecommitdiff
path: root/test/runtest
diff options
context:
space:
mode:
authorJeremy Harris <jgh146exb@wizmail.org>2022-12-22 14:58:57 +0000
committerJeremy Harris <jgh146exb@wizmail.org>2022-12-22 18:46:22 +0000
commit0288c50a848a19822b9d693681c53d5db1fc8ae6 (patch)
tree0e3330bac09db3bca6ba5ea42d06d62d396d0996 /test/runtest
parentc68dd63514daee71b12bb62c04400dc2f8116d96 (diff)
downloadexim4-0288c50a848a19822b9d693681c53d5db1fc8ae6.tar.gz
Testsuite: fix munging for leading-space on PID
Diffstat (limited to 'test/runtest')
-rwxr-xr-xtest/runtest6
1 files changed, 2 insertions, 4 deletions
diff --git a/test/runtest b/test/runtest
index 38e03b3ac..49789319b 100755
--- a/test/runtest
+++ b/test/runtest
@@ -1076,12 +1076,10 @@ RESET_AFTER_EXTRA_LINE_READ:
)
/x;
- # Lines with a leading pid
- s/^(\d+)\s(?!(?:previous message|in\s|bytes remain in))/new_value($1, "p%s", \$next_pid) . ' '/e;
+ # Lines with a leading pid. Only handle >= 4-digit PIDs to avoid converting SMTP respose codes
+ s/^(\s*\d{4,})\s(?!(?:previous message|in\s|bytes remain in|SMTP accept process running))/new_value($1, "p%s", \$next_pid) . ' '/e;
# Debugging lines for Exim terminations and process-generation
-
- s/^\s*\K(\d+)(?=\sexec\s.*\s-oPX$)/new_value($1, "%s", \$next_pid)/xe;
next if /(?:postfork: | fork(?:ing|ed) for )/;
# IP address lookups use gethostbyname() when IPv6 is not supported,