DMARC: expand main-config options. Bug 3102

[exim.git] / test / scripts / 0000-Basic / 0700

diff --git a/test/scripts/0000-Basic/0700 b/test/scripts/0000-Basic/0700
index 7bc8671df5cf74f44b44997b256e02b923e780ac..74d19d7b3a159ed2c4ba27de6c5ef65309c79645 100644 (file)
--- a/test/scripts/0000-Basic/0700
+++ b/test/scripts/0000-Basic/0700
@@ -46,11 +46,11 @@ exim_msgdate --base36 000000-005XGK-00
 0 TZ=GMT
 exim_msgdate --base36 ZZZZZZ-005XGK-RR
 ****
 0 TZ=GMT
 exim_msgdate --base36 ZZZZZZ-005XGK-RR
 ****

-255 TZ=GB
+~0 TZ=GB

 exim_msgdate --base36 zzzzzz-005xgk-zz
 ****
 ### An invalid base option
 exim_msgdate --base36 zzzzzz-005xgk-zz
 ****
 ### An invalid base option

-255 TZ=GMT
+~0 TZ=GMT

 exim_msgdate --base 32 ZZZZZZ
 ****
 ### Message IDs generated on a standard system
 exim_msgdate --base 32 ZZZZZZ
 ****
 ### Message IDs generated on a standard system


@@ -127,19 +127,19 @@ exim_msgdate --localhost_number 9 -base 62 EZZZZZZ-003FPJ-WF
 0 TZ=GMT
 exim_msgdate --localhost_number 9 -base 36 EZZZZZZ-003FPJ-Q0
 ****
 0 TZ=GMT
 exim_msgdate --localhost_number 9 -base 36 EZZZZZZ-003FPJ-Q0
 ****

-# hostno too big
-255 TZ=GMT
+### hostno too big
+~0 TZ=GMT

 exim_msgdate --localhost_number 11 -base 36 EZZZZZZ-003FPJ-WF
 ****
 0 TZ=GMT
 exim_msgdate -localhost_number 9 --local -base 62 EZZZZZZ-003FPJ-WF
 ****
 exim_msgdate --localhost_number 11 -base 36 EZZZZZZ-003FPJ-WF
 ****
 0 TZ=GMT
 exim_msgdate -localhost_number 9 --local -base 62 EZZZZZZ-003FPJ-WF
 ****

-# hostno negative
-255 TZ=GMT
+### hostno negative
+~0 TZ=GMT

 exim_msgdate --localhost_number -1 -base 36 EZZZZZZ-003FPJ-WF
 ****
 exim_msgdate --localhost_number -1 -base 36 EZZZZZZ-003FPJ-WF
 ****

-# hostno too big
-255 TZ=GMT
+### hostno too big
+~0 TZ=GMT

 exim_msgdate --localhost_number 19 -base 62 EZZZZZZ-003FPJ-WF
 ****
 #
 exim_msgdate --localhost_number 19 -base 62 EZZZZZZ-003FPJ-WF
 ****
 #


@@ -187,16 +187,16 @@ exim_msgdate -l -u -z -localhost_number=13 000000 1PANS3 zzzzzz
 exim_msgdate -l -u -z -localhost_number=13 000000 1PANS3 ZZZZZZ
 ****
 ### All msg-id types, all zones,  localhost_number = 20
 exim_msgdate -l -u -z -localhost_number=13 000000 1PANS3 ZZZZZZ
 ****
 ### All msg-id types, all zones,  localhost_number = 20

-255 TZ=GB
+~0 TZ=GB

 exim_msgdate -l -u -z -localhost_number=20 E000000-005XGK-00
 ****
 exim_msgdate -l -u -z -localhost_number=20 E000000-005XGK-00
 ****

-255 TZ=GMT
+~0 TZ=GMT

 exim_msgdate -l -u -z -localhost_number=20 000000-005XGK-00 ZZZZZZ-005XGK-zz 1PANS3-003FPJ-TW
 ****
 exim_msgdate -l -u -z -localhost_number=20 000000-005XGK-00 ZZZZZZ-005XGK-zz 1PANS3-003FPJ-TW
 ****

-255 TZ=GB
+~0 TZ=GB

 exim_msgdate -l -u -z -localhost_number=20 000000 1PANS3 zzzzzz
 ****
 exim_msgdate -l -u -z -localhost_number=20 000000 1PANS3 zzzzzz
 ****

-255 TZ=GMT
+~0 TZ=GMT

 exim_msgdate -l -u -z -localhost_number=20 000000 1PANS3 ZZZZZZ
 ****
 ### All msg-id types, all zones,  base=36
 exim_msgdate -l -u -z -localhost_number=20 000000 1PANS3 ZZZZZZ
 ****
 ### All msg-id types, all zones,  base=36


@@ -206,7 +206,7 @@ exim_msgdate -l -u -z --b36 E000000-005XGK-00
 0 TZ=GMT
 exim_msgdate -l -u -z --b36 000000-005XGK-00 ZZZZZZ-005XGK-R0 1PANS3-003FPJ-RR
 ****
 0 TZ=GMT
 exim_msgdate -l -u -z --b36 000000-005XGK-00 ZZZZZZ-005XGK-R0 1PANS3-003FPJ-RR
 ****

-255 TZ=GB
+~0 TZ=GB

 exim_msgdate -l -u -z --b36 000000 1PANS3 zzzzzz
 ****
 0 TZ=GMT
 exim_msgdate -l -u -z --b36 000000 1PANS3 zzzzzz
 ****
 0 TZ=GMT