From 641c3ed52f0a4d730eb4bed7f2dd482825347a94 Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Sat, 1 Jul 2023 17:30:16 +0100 Subject: [PATCH] Testsuite: account for new warning from exim_msgdate Broken-by: 46a36afae41f --- test/runtest | 4 +++- test/scripts/0000-Basic/0700 | 15 +++++++++------ test/stderr/0700 | 19 ++++++++----------- test/stderr/0701 | 36 ++++++++++++++++++------------------ test/stderr/0702 | 32 ++++++++++++++++---------------- test/stderr/0703 | 16 ++++++++-------- test/stdout/0700 | 12 ++++++------ 7 files changed, 68 insertions(+), 66 deletions(-) diff --git a/test/runtest b/test/runtest index c99320b6e..8ad86365d 100755 --- a/test/runtest +++ b/test/runtest @@ -389,9 +389,11 @@ LINE: while() RESET_AFTER_EXTRA_LINE_READ: if ($munge_skip) { - # Munging is a no-op. + # Munging is a no-op, except for exim_msgdate specials. # Useful when testing exim_msgdate so that # we compare unmunged dates and message-ids. + s%^localhost \d+ from message-id != given number \d+ at \K/.+(?=/test/eximdir/exim_msgdate line 387.$)%DIR%; + print MUNGED; next; } diff --git a/test/scripts/0000-Basic/0700 b/test/scripts/0000-Basic/0700 index af5fd600c..df5162f31 100644 --- a/test/scripts/0000-Basic/0700 +++ b/test/scripts/0000-Basic/0700 @@ -119,23 +119,26 @@ exim_msgdate -local --pid EZZZZZZ-003fPj-WF **** ### Override the value of localhost_number set in the exim configuation file 0 TZ=GB -exim_msgdate -local --localhost_number 11 -base 62 EZZZZZZ-003FPJ-WF +exim_msgdate -local --localhost_number 9 -base 62 EZZZZZZ-003FPJ-WF **** 0 TZ=GB -exim_msgdate --localhost_number 11 -base 62 EZZZZZZ-003FPJ-WF +exim_msgdate --localhost_number 9 -base 62 EZZZZZZ-003FPJ-WF **** 0 TZ=GB exim_msgdate --localhost_number 9 -base 36 EZZZZZZ-003FPJ-Q0 **** +# hostno too big 255 TZ=GB exim_msgdate --localhost_number 11 -base 36 EZZZZZZ-003FPJ-WF **** 0 TZ=GB -exim_msgdate -localhost_number 11 --local -base 62 EZZZZZZ-003FPJ-WF +exim_msgdate -localhost_number 9 --local -base 62 EZZZZZZ-003FPJ-WF **** +# hostno negative 255 TZ=GB exim_msgdate --localhost_number -1 -base 36 EZZZZZZ-003FPJ-WF **** +# hostno too big 255 TZ=GB exim_msgdate --localhost_number 19 -base 62 EZZZZZZ-003FPJ-WF **** @@ -162,7 +165,7 @@ exim_msgdate -l -u -z -pid 000000 1PANS3 ZZZZZZ exim_msgdate -l -u -z -localhost_number=3 E000000-005XGK-00 **** 0 TZ=GB -exim_msgdate -l -u -z -localhost_number=3 000000-005XGK-00 ZZZZZZ-005XGK-WF 1PANS3-003FPJ-TW +exim_msgdate -l -u -z -localhost_number=3 000000-005XGK-00 ZZZZZZ-005XGK-zz 1PANS3-003FPJ-TW **** 0 TZ=GB exim_msgdate -l -u -z -localhost_number=3 000000 1PANS3 zzzzzz @@ -175,7 +178,7 @@ exim_msgdate -l -u -z -localhost_number=3 000000 1PANS3 ZZZZZZ exim_msgdate -l -u -z -localhost_number=13 E000000-005XGK-00 **** 0 TZ=GB -exim_msgdate -l -u -z -localhost_number=13 000000-005XGK-00 ZZZZZZ-005XGK-WF 1PANS3-003FPJ-TW +exim_msgdate -l -u -z -localhost_number=13 000000-005XGK-00 ZZZZZZ-005XGK-zz 1PANS3-003FPJ-TW **** 0 TZ=GB exim_msgdate -l -u -z -localhost_number=13 000000 1PANS3 zzzzzz @@ -188,7 +191,7 @@ exim_msgdate -l -u -z -localhost_number=13 000000 1PANS3 ZZZZZZ exim_msgdate -l -u -z -localhost_number=20 E000000-005XGK-00 **** 255 TZ=GB -exim_msgdate -l -u -z -localhost_number=20 000000-005XGK-00 ZZZZZZ-005XGK-WF 1PANS3-003FPJ-TW +exim_msgdate -l -u -z -localhost_number=20 000000-005XGK-00 ZZZZZZ-005XGK-zz 1PANS3-003FPJ-TW **** 255 TZ=GB exim_msgdate -l -u -z -localhost_number=20 000000 1PANS3 zzzzzz diff --git a/test/stderr/0700 b/test/stderr/0700 index 5a6d66620..48aafe811 100644 --- a/test/stderr/0700 +++ b/test/stderr/0700 @@ -23,24 +23,21 @@ zzzzzzz not parsed ### Print date as seconds since the UNIX epoch. ### Show the process id too ### Override the value of localhost_number set in the exim configuation file -localhost 9 from message-id != given number 11 at /data/jgh/git/exim/test/eximdir/exim_msgdate line 387. -localhost 9 from message-id != given number 11 at /data/jgh/git/exim/test/eximdir/exim_msgdate line 387. localhost_number > 10 -localhost 9 from message-id != given number 11 at /data/jgh/git/exim/test/eximdir/exim_msgdate line 387. localhost_number must be a number >=0 localhost_number > 16 ### From here as 701 - 703 ### Each msg-id type, all zone ### All msg-id types, all zones, localhost_number = 3 -localhost 0 from message-id != given number 3 at /data/jgh/git/exim/test/eximdir/exim_msgdate line 387. -localhost 0 from message-id != given number 3 at /data/jgh/git/exim/test/eximdir/exim_msgdate line 387. -localhost 9 from message-id != given number 3 at /data/jgh/git/exim/test/eximdir/exim_msgdate line 387. -localhost 9 from message-id != given number 3 at /data/jgh/git/exim/test/eximdir/exim_msgdate line 387. +localhost 0 from message-id != given number 3 at DIR/test/eximdir/exim_msgdate line 387. +localhost 0 from message-id != given number 3 at DIR/test/eximdir/exim_msgdate line 387. +localhost 19 from message-id != given number 3 at DIR/test/eximdir/exim_msgdate line 387. +localhost 9 from message-id != given number 3 at DIR/test/eximdir/exim_msgdate line 387. ### All msg-id types, all zones, localhost_number = 13 -localhost 0 from message-id != given number 13 at /data/jgh/git/exim/test/eximdir/exim_msgdate line 387. -localhost 0 from message-id != given number 13 at /data/jgh/git/exim/test/eximdir/exim_msgdate line 387. -localhost 9 from message-id != given number 13 at /data/jgh/git/exim/test/eximdir/exim_msgdate line 387. -localhost 9 from message-id != given number 13 at /data/jgh/git/exim/test/eximdir/exim_msgdate line 387. +localhost 0 from message-id != given number 13 at DIR/test/eximdir/exim_msgdate line 387. +localhost 0 from message-id != given number 13 at DIR/test/eximdir/exim_msgdate line 387. +localhost 19 from message-id != given number 13 at DIR/test/eximdir/exim_msgdate line 387. +localhost 9 from message-id != given number 13 at DIR/test/eximdir/exim_msgdate line 387. ### All msg-id types, all zones, localhost_number = 20 localhost_number > 16 localhost_number > 16 diff --git a/test/stderr/0701 b/test/stderr/0701 index cf2c96fae..5c90f5736 100644 --- a/test/stderr/0701 +++ b/test/stderr/0701 @@ -1,33 +1,33 @@ ### Each msg-id type, all zone -localhost 0 from message-id != given number 3 at /data/jgh/git/exim/test/eximdir/exim_msgdate line 387. -localhost 0 from message-id != given number 3 at /data/jgh/git/exim/test/eximdir/exim_msgdate line 387. -localhost 19 from message-id != given number 3 at /data/jgh/git/exim/test/eximdir/exim_msgdate line 387. -localhost 9 from message-id != given number 3 at /data/jgh/git/exim/test/eximdir/exim_msgdate line 387. +localhost 0 from message-id != given number 3 at DIR/test/eximdir/exim_msgdate line 387. +localhost 0 from message-id != given number 3 at DIR/test/eximdir/exim_msgdate line 387. +localhost 19 from message-id != given number 3 at DIR/test/eximdir/exim_msgdate line 387. +localhost 9 from message-id != given number 3 at DIR/test/eximdir/exim_msgdate line 387. ### All msg-id types, all zones, localhost_number = 3 -localhost 0 from message-id != given number 3 at /data/jgh/git/exim/test/eximdir/exim_msgdate line 387. -localhost 0 from message-id != given number 3 at /data/jgh/git/exim/test/eximdir/exim_msgdate line 387. -localhost 19 from message-id != given number 3 at /data/jgh/git/exim/test/eximdir/exim_msgdate line 387. -localhost 9 from message-id != given number 3 at /data/jgh/git/exim/test/eximdir/exim_msgdate line 387. +localhost 0 from message-id != given number 3 at DIR/test/eximdir/exim_msgdate line 387. +localhost 0 from message-id != given number 3 at DIR/test/eximdir/exim_msgdate line 387. +localhost 19 from message-id != given number 3 at DIR/test/eximdir/exim_msgdate line 387. +localhost 9 from message-id != given number 3 at DIR/test/eximdir/exim_msgdate line 387. ### All msg-id types, all zones, localhost_number = 13 -localhost 0 from message-id != given number 13 at /data/jgh/git/exim/test/eximdir/exim_msgdate line 387. -localhost 0 from message-id != given number 13 at /data/jgh/git/exim/test/eximdir/exim_msgdate line 387. -localhost 19 from message-id != given number 13 at /data/jgh/git/exim/test/eximdir/exim_msgdate line 387. -localhost 9 from message-id != given number 13 at /data/jgh/git/exim/test/eximdir/exim_msgdate line 387. +localhost 0 from message-id != given number 13 at DIR/test/eximdir/exim_msgdate line 387. +localhost 0 from message-id != given number 13 at DIR/test/eximdir/exim_msgdate line 387. +localhost 19 from message-id != given number 13 at DIR/test/eximdir/exim_msgdate line 387. +localhost 9 from message-id != given number 13 at DIR/test/eximdir/exim_msgdate line 387. ### All msg-id types, all zones, localhost_number = 20 localhost_number > 16 localhost_number > 16 localhost_number > 16 localhost_number > 16 ### All msg-id types, all zones, base=36 -localhost 0 from message-id != given number 3 at /data/jgh/git/exim/test/eximdir/exim_msgdate line 387. -localhost 0 from message-id != given number 3 at /data/jgh/git/exim/test/eximdir/exim_msgdate line 387. +localhost 0 from message-id != given number 3 at DIR/test/eximdir/exim_msgdate line 387. +localhost 0 from message-id != given number 3 at DIR/test/eximdir/exim_msgdate line 387. zz is not base 36 zzzzzz is not base 36 ### All msg-id types, all zones, base=62 -localhost 0 from message-id != given number 3 at /data/jgh/git/exim/test/eximdir/exim_msgdate line 387. -localhost 0 from message-id != given number 3 at /data/jgh/git/exim/test/eximdir/exim_msgdate line 387. -localhost 19 from message-id != given number 3 at /data/jgh/git/exim/test/eximdir/exim_msgdate line 387. -localhost 9 from message-id != given number 3 at /data/jgh/git/exim/test/eximdir/exim_msgdate line 387. +localhost 0 from message-id != given number 3 at DIR/test/eximdir/exim_msgdate line 387. +localhost 0 from message-id != given number 3 at DIR/test/eximdir/exim_msgdate line 387. +localhost 19 from message-id != given number 3 at DIR/test/eximdir/exim_msgdate line 387. +localhost 9 from message-id != given number 3 at DIR/test/eximdir/exim_msgdate line 387. ******** SERVER ******** ### Each msg-id type, all zone diff --git a/test/stderr/0702 b/test/stderr/0702 index a84a6f097..772ba55b1 100644 --- a/test/stderr/0702 +++ b/test/stderr/0702 @@ -1,18 +1,18 @@ ### Each msg-id type, all zone -localhost 0 from message-id != given number 13 at /data/jgh/git/exim/test/eximdir/exim_msgdate line 387. -localhost 0 from message-id != given number 13 at /data/jgh/git/exim/test/eximdir/exim_msgdate line 387. -localhost 19 from message-id != given number 13 at /data/jgh/git/exim/test/eximdir/exim_msgdate line 387. -localhost 9 from message-id != given number 13 at /data/jgh/git/exim/test/eximdir/exim_msgdate line 387. +localhost 0 from message-id != given number 13 at DIR/test/eximdir/exim_msgdate line 387. +localhost 0 from message-id != given number 13 at DIR/test/eximdir/exim_msgdate line 387. +localhost 19 from message-id != given number 13 at DIR/test/eximdir/exim_msgdate line 387. +localhost 9 from message-id != given number 13 at DIR/test/eximdir/exim_msgdate line 387. ### All msg-id types, all zones, localhost_number = 3 -localhost 0 from message-id != given number 3 at /data/jgh/git/exim/test/eximdir/exim_msgdate line 387. -localhost 0 from message-id != given number 3 at /data/jgh/git/exim/test/eximdir/exim_msgdate line 387. -localhost 19 from message-id != given number 3 at /data/jgh/git/exim/test/eximdir/exim_msgdate line 387. -localhost 9 from message-id != given number 3 at /data/jgh/git/exim/test/eximdir/exim_msgdate line 387. +localhost 0 from message-id != given number 3 at DIR/test/eximdir/exim_msgdate line 387. +localhost 0 from message-id != given number 3 at DIR/test/eximdir/exim_msgdate line 387. +localhost 19 from message-id != given number 3 at DIR/test/eximdir/exim_msgdate line 387. +localhost 9 from message-id != given number 3 at DIR/test/eximdir/exim_msgdate line 387. ### All msg-id types, all zones, localhost_number = 13 -localhost 0 from message-id != given number 13 at /data/jgh/git/exim/test/eximdir/exim_msgdate line 387. -localhost 0 from message-id != given number 13 at /data/jgh/git/exim/test/eximdir/exim_msgdate line 387. -localhost 19 from message-id != given number 13 at /data/jgh/git/exim/test/eximdir/exim_msgdate line 387. -localhost 9 from message-id != given number 13 at /data/jgh/git/exim/test/eximdir/exim_msgdate line 387. +localhost 0 from message-id != given number 13 at DIR/test/eximdir/exim_msgdate line 387. +localhost 0 from message-id != given number 13 at DIR/test/eximdir/exim_msgdate line 387. +localhost 19 from message-id != given number 13 at DIR/test/eximdir/exim_msgdate line 387. +localhost 9 from message-id != given number 13 at DIR/test/eximdir/exim_msgdate line 387. ### All msg-id types, all zones, localhost_number = 20 localhost_number > 16 localhost_number > 16 @@ -24,10 +24,10 @@ localhost_number > 10 localhost_number > 10 localhost_number > 10 ### All msg-id types, all zones, base=62 -localhost 0 from message-id != given number 13 at /data/jgh/git/exim/test/eximdir/exim_msgdate line 387. -localhost 0 from message-id != given number 13 at /data/jgh/git/exim/test/eximdir/exim_msgdate line 387. -localhost 19 from message-id != given number 13 at /data/jgh/git/exim/test/eximdir/exim_msgdate line 387. -localhost 9 from message-id != given number 13 at /data/jgh/git/exim/test/eximdir/exim_msgdate line 387. +localhost 0 from message-id != given number 13 at DIR/test/eximdir/exim_msgdate line 387. +localhost 0 from message-id != given number 13 at DIR/test/eximdir/exim_msgdate line 387. +localhost 19 from message-id != given number 13 at DIR/test/eximdir/exim_msgdate line 387. +localhost 9 from message-id != given number 13 at DIR/test/eximdir/exim_msgdate line 387. ******** SERVER ******** ### Each msg-id type, all zone diff --git a/test/stderr/0703 b/test/stderr/0703 index 42de6f1c2..df30a9f02 100644 --- a/test/stderr/0703 +++ b/test/stderr/0703 @@ -4,15 +4,15 @@ localhost_number > 16 localhost_number > 16 localhost_number > 16 ### All msg-id types, all zones, localhost_number = 3 -localhost 0 from message-id != given number 3 at /data/jgh/git/exim/test/eximdir/exim_msgdate line 387. -localhost 0 from message-id != given number 3 at /data/jgh/git/exim/test/eximdir/exim_msgdate line 387. -localhost 19 from message-id != given number 3 at /data/jgh/git/exim/test/eximdir/exim_msgdate line 387. -localhost 9 from message-id != given number 3 at /data/jgh/git/exim/test/eximdir/exim_msgdate line 387. +localhost 0 from message-id != given number 3 at DIR/test/eximdir/exim_msgdate line 387. +localhost 0 from message-id != given number 3 at DIR/test/eximdir/exim_msgdate line 387. +localhost 19 from message-id != given number 3 at DIR/test/eximdir/exim_msgdate line 387. +localhost 9 from message-id != given number 3 at DIR/test/eximdir/exim_msgdate line 387. ### All msg-id types, all zones, localhost_number = 13 -localhost 0 from message-id != given number 13 at /data/jgh/git/exim/test/eximdir/exim_msgdate line 387. -localhost 0 from message-id != given number 13 at /data/jgh/git/exim/test/eximdir/exim_msgdate line 387. -localhost 19 from message-id != given number 13 at /data/jgh/git/exim/test/eximdir/exim_msgdate line 387. -localhost 9 from message-id != given number 13 at /data/jgh/git/exim/test/eximdir/exim_msgdate line 387. +localhost 0 from message-id != given number 13 at DIR/test/eximdir/exim_msgdate line 387. +localhost 0 from message-id != given number 13 at DIR/test/eximdir/exim_msgdate line 387. +localhost 19 from message-id != given number 13 at DIR/test/eximdir/exim_msgdate line 387. +localhost 9 from message-id != given number 13 at DIR/test/eximdir/exim_msgdate line 387. ### All msg-id types, all zones, localhost_number = 20 localhost_number > 16 localhost_number > 16 diff --git a/test/stdout/0700 b/test/stdout/0700 index 5c0739f72..fd8f2a83a 100644 --- a/test/stdout/0700 +++ b/test/stdout/0700 @@ -91,9 +91,9 @@ 0.000000 1970-01-01 00:00:00.000000 1970-01-01 01:00:00.000000 BST -32590299105.995000 -3002-09-30 12:51:45.995000 -3002-09-30 13:51:45.995000 BST +32590299105.215000 +3002-09-30 12:51:45.215000 +3002-09-30 13:51:45.215000 BST 1288014663.150000 2010-10-25 13:51:03.150000 2010-10-25 14:51:03.150000 BST @@ -122,9 +122,9 @@ 0.000000 1970-01-01 00:00:00.000000 1970-01-01 01:00:00.000000 BST -32590299105.995000 -3002-09-30 12:51:45.995000 -3002-09-30 13:51:45.995000 BST +32590299105.215000 +3002-09-30 12:51:45.215000 +3002-09-30 13:51:45.215000 BST 1288014663.150000 2010-10-25 13:51:03.150000 2010-10-25 14:51:03.150000 BST -- 2.30.2