diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2023-07-05 15:23:13 +0100 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2023-07-05 15:23:13 +0100 |
| commit | b67ff4e2d563832865e89a4f45afd93a23fc9aa9 (patch) | |
| tree | a779dca9b62f06cd65f0320989e775c86fc007e5 | |
| parent | 0e20cde8dbd0ad7308a972bca06d38a817aeb23b (diff) | |
Testsuite: more munging for mailq output
| -rwxr-xr-x | test/runtest | 2 | ||||
| -rw-r--r-- | test/stdout/0699 | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/test/runtest b/test/runtest index bc570842a..80b7721fb 100755 --- a/test/runtest +++ b/test/runtest @@ -891,7 +891,7 @@ RESET_AFTER_EXTRA_LINE_READ: s/([\s,])S=\d+\b/$1S=sss/; s/:S\d+\b/:Ssss/; - s/^(\s*\d+[mhd]\s+)\d+(\s+[a-z0-9-]{23} <)/TTT sss$2/i if $is_stdout; + s/^(\s*\d+[mhd]\s+)\d+(\s+(?:[a-z0-9-]{23}|[a-z0-9-]{18}) <)/TTT sss$2/i if $is_stdout; s/\sSIZE=\d+\b/ SIZE=ssss/; s/\ssize=\d+\b/ size=sss/ if $is_stderr; s/old size = \d+\b/old size = sssss/; diff --git a/test/stdout/0699 b/test/stdout/0699 index c8434157b..bd8fab1c7 100644 --- a/test/stdout/0699 +++ b/test/stdout/0699 @@ -2,7 +2,7 @@ TTT sss 10HmaX-000000005vi-0000 <CALLER@the.local.host.name> nulldeliver@test.ex exim_id_update exit code = 0 - 0m 396 10HmaY-0005vi-00-H <CALLER@the.local.host.name> +TTT sss 10HmaY-0005vi-00-H <CALLER@the.local.host.name> nulldeliver@test.ex exim_id_update exit code = 0 |