Testsuite: Use TZ-GMT rather than GB for far-future dates

Older systems seem to not have dst info for year 3002 and give a GMT result for TZ=GB

2 files changed, 60 insertions, 60 deletions

diff --git a/test/scripts/0000-Basic/0700 b/test/scripts/0000-Basic/0700
index df5162f31..7bc8671df 100644
--- a/test/scripts/0000-Basic/0700
+++ b/test/scripts/0000-Basic/0700
@@ -43,14 +43,14 @@ exim_msgdate E000000-005XGK-00 1pAnS3-003fPj-Tw zzzzzz
 0 TZ=GB
 exim_msgdate --base36 000000-005XGK-00
 ****
-0 TZ=GB
+0 TZ=GMT
 exim_msgdate --base36 ZZZZZZ-005XGK-RR
 ****
 255 TZ=GB
 exim_msgdate --base36 zzzzzz-005xgk-zz
 ****
 ### An invalid base option
-255 TZ=GB
+255 TZ=GMT
 exim_msgdate --base 32 ZZZZZZ
 ****
 ### Message IDs generated on a standard system
@@ -58,7 +58,7 @@ exim_msgdate --base 32 ZZZZZZ
 0 TZ=GB
 exim_msgdate --base62 000000-005XGK-00
 ****
-0 TZ=GB
+0 TZ=GMT
 exim_msgdate --base62 ZZZZZZ-005XGK-WF
 ****
 0 TZ=GB
@@ -94,7 +94,7 @@ exim_msgdate -GMT E1pAnS3-003fPj-Tw
 0 TZ=GB
 exim_msgdate -zulu E1pAnS3-003fPj-Tw
 ****
-0 TZ=GB
+0 TZ=GMT
 exim_msgdate -zulu EZZZZZZ-003fPj-WF
 ****
 ### Print date as seconds since the UNIX epoch.
@@ -108,38 +108,38 @@ exim_msgdate -unix E1pAnS3-003fPj-WF
 exim_msgdate -unix Ezzzzzz-003fpj-WF
 ****
 ### Show the process id too
-0 TZ=GB
+0 TZ=GMT
 exim_msgdate -unix --pid EZZZZZZ-003fPj-WF
 ****
-0 TZ=GB
+0 TZ=GMT
 exim_msgdate -pid EZZZZZZ-003fPj-WF
 ****
-0 TZ=GB
+0 TZ=GMT
 exim_msgdate -local --pid EZZZZZZ-003fPj-WF
 ****
 ### Override the value of localhost_number set in the exim configuation file
-0 TZ=GB
+0 TZ=GMT
 exim_msgdate -local --localhost_number 9 -base 62 EZZZZZZ-003FPJ-WF
 ****
-0 TZ=GB
+0 TZ=GMT
 exim_msgdate --localhost_number 9 -base 62 EZZZZZZ-003FPJ-WF
 ****
-0 TZ=GB
+0 TZ=GMT
 exim_msgdate --localhost_number 9 -base 36 EZZZZZZ-003FPJ-Q0
 ****
 # hostno too big
-255 TZ=GB
+255 TZ=GMT
 exim_msgdate --localhost_number 11 -base 36 EZZZZZZ-003FPJ-WF
 ****
-0 TZ=GB
+0 TZ=GMT
 exim_msgdate -localhost_number 9 --local -base 62 EZZZZZZ-003FPJ-WF
 ****
 # hostno negative
-255 TZ=GB
+255 TZ=GMT
 exim_msgdate --localhost_number -1 -base 36 EZZZZZZ-003FPJ-WF
 ****
 # hostno too big
-255 TZ=GB
+255 TZ=GMT
 exim_msgdate --localhost_number 19 -base 62 EZZZZZZ-003FPJ-WF
 ****
 #
@@ -151,77 +151,77 @@ exim_msgdate --localhost_number 19 -base 62 EZZZZZZ-003FPJ-WF
 0 TZ=GB
 exim_msgdate -l -u -z -pid E000000-005XGK-00
 ****
-0 TZ=GB
+0 TZ=GMT
 exim_msgdate -l -u -z -pid 000000-005XGK-00 ZZZZZZ-005XGK-WF 1PANS3-003FPJ-TW
 ****
 0 TZ=GB
 exim_msgdate -l -u -z -pid 000000 1PANS3 zzzzzz
 ****
-0 TZ=GB
+0 TZ=GMT
 exim_msgdate -l -u -z -pid 000000 1PANS3 ZZZZZZ
 ****
 ### All msg-id types, all zones,  localhost_number = 3
 0 TZ=GB
 exim_msgdate -l -u -z -localhost_number=3 E000000-005XGK-00
 ****
-0 TZ=GB
+0 TZ=GMT
 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
 ****
-0 TZ=GB
+0 TZ=GMT
 exim_msgdate -l -u -z -localhost_number=3 000000 1PANS3 ZZZZZZ
 ****
 ### All msg-id types, all zones,  localhost_number = 13
 0 TZ=GB
 exim_msgdate -l -u -z -localhost_number=13 E000000-005XGK-00
 ****
-0 TZ=GB
+0 TZ=GMT
 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
 ****
-0 TZ=GB
+0 TZ=GMT
 exim_msgdate -l -u -z -localhost_number=13 000000 1PANS3 ZZZZZZ
 ****
 ### All msg-id types, all zones,  localhost_number = 20
 255 TZ=GB
 exim_msgdate -l -u -z -localhost_number=20 E000000-005XGK-00
 ****
-255 TZ=GB
+255 TZ=GMT
 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
 ****
-255 TZ=GB
+255 TZ=GMT
 exim_msgdate -l -u -z -localhost_number=20 000000 1PANS3 ZZZZZZ
 ****
 ### All msg-id types, all zones,  base=36
 0 TZ=GB
 exim_msgdate -l -u -z --b36 E000000-005XGK-00
 ****
-0 TZ=GB
+0 TZ=GMT
 exim_msgdate -l -u -z --b36 000000-005XGK-00 ZZZZZZ-005XGK-R0 1PANS3-003FPJ-RR
 ****
 255 TZ=GB
 exim_msgdate -l -u -z --b36 000000 1PANS3 zzzzzz
 ****
-0 TZ=GB
+0 TZ=GMT
 exim_msgdate -l -u -z --b36 000000 1PANS3 ZZZZZZ
 ****
 ### All msg-id types, all zones,  base=62
 0 TZ=GB
 exim_msgdate -l -u -z --b62 E000000-005XGK-00
 ****
-0 TZ=GB
+0 TZ=GMT
 exim_msgdate -l -u -z --b62 000000-005XGK-00 ZZZZZZ-005XGK-WF 1PANS3-003FPJ-TW
 ****
 0 TZ=GB
 exim_msgdate -l -u -z --b62 000000 1PANS3 zzzzzz
 ****
-0 TZ=GB
+0 TZ=GMT
 exim_msgdate -l -u -z --b62 000000 1PANS3 ZZZZZZ
 ****
diff --git a/test/stdout/0700 b/test/stdout/0700
index fd8f2a83a..3a7373b67 100644
--- a/test/stdout/0700
+++ b/test/stdout/0700
@@ -27,7 +27,7 @@
 ### Message IDs generated on a standard system
 ### with high-resolution Message-ID timestamps
 1970-01-01 01:00:00.000000 BST
-3002-09-30 13:51:45.999500 BST
+3002-09-30 12:51:45.999500 GMT
 3769-12-05 03:13:03.999500 GMT
 ### Some strings that are similar to, but not Exim Message IDs:
 ### Print date with localtime
@@ -45,13 +45,13 @@
 56800235583.999500
 ### Show the process id too
 32590299105.999500	pid 874183
-3002-09-30 13:51:45.999500 BST	pid 874183
-3002-09-30 13:51:45.999500 BST	pid 874183
+3002-09-30 12:51:45.999500 GMT	pid 874183
+3002-09-30 12:51:45.999500 GMT	pid 874183
 ### Override the value of localhost_number set in the exim configuation file
-3002-09-30 13:51:45.995000 BST
-3002-09-30 13:51:45.995000 BST
+3002-09-30 12:51:45.995000 GMT
+3002-09-30 12:51:45.995000 GMT
 2038-12-24 05:45:35.360000 GMT
-3002-09-30 13:51:45.995000 BST
+3002-09-30 12:51:45.995000 GMT
 ### From here as 701 - 703
 ### Each msg-id type, all zone
 0.000000	pid 1319504
@@ -59,13 +59,13 @@
 1970-01-01 01:00:00.000000 BST	pid 1319504
 0.000000	pid 1319504
 1970-01-01 00:00:00.000000	pid 1319504
-1970-01-01 01:00:00.000000 BST	pid 1319504
+1970-01-01 00:00:00.000000 GMT	pid 1319504
 32590299105.999500	pid 1319504
 3002-09-30 12:51:45.999500	pid 1319504
-3002-09-30 13:51:45.999500 BST	pid 1319504
+3002-09-30 12:51:45.999500 GMT	pid 1319504
 1288014663.915000	pid 774213
 2010-10-25 13:51:03.915000	pid 774213
-2010-10-25 14:51:03.915000 BST	pid 774213
+2010-10-25 13:51:03.915000 GMT	pid 774213
 0.000000
 1970-01-01 00:00:00.000000
 1970-01-01 01:00:00.000000 BST
@@ -77,26 +77,26 @@
 3769-12-05 03:13:03.000000 GMT
 0.000000
 1970-01-01 00:00:00.000000
-1970-01-01 01:00:00.000000 BST
+1970-01-01 00:00:00.000000 GMT
 1288014663.000000
 2010-10-25 13:51:03.000000
-2010-10-25 14:51:03.000000 BST
+2010-10-25 13:51:03.000000 GMT
 32590299105.000000
 3002-09-30 12:51:45.000000
-3002-09-30 13:51:45.000000 BST
+3002-09-30 12:51:45.000000 GMT
 ### All msg-id types, all zones,  localhost_number = 3
 0.000000
 1970-01-01 00:00:00.000000
 1970-01-01 01:00:00.000000 BST
 0.000000
 1970-01-01 00:00:00.000000
-1970-01-01 01:00:00.000000 BST
+1970-01-01 00:00:00.000000 GMT
 32590299105.215000
 3002-09-30 12:51:45.215000
-3002-09-30 13:51:45.215000 BST
+3002-09-30 12:51:45.215000 GMT
 1288014663.150000
 2010-10-25 13:51:03.150000
-2010-10-25 14:51:03.150000 BST
+2010-10-25 13:51:03.150000 GMT
 0.000000
 1970-01-01 00:00:00.000000
 1970-01-01 01:00:00.000000 BST
@@ -108,26 +108,26 @@
 3769-12-05 03:13:03.000000 GMT
 0.000000
 1970-01-01 00:00:00.000000
-1970-01-01 01:00:00.000000 BST
+1970-01-01 00:00:00.000000 GMT
 1288014663.000000
 2010-10-25 13:51:03.000000
-2010-10-25 14:51:03.000000 BST
+2010-10-25 13:51:03.000000 GMT
 32590299105.000000
 3002-09-30 12:51:45.000000
-3002-09-30 13:51:45.000000 BST
+3002-09-30 12:51:45.000000 GMT
 ### All msg-id types, all zones,  localhost_number = 13
 0.000000
 1970-01-01 00:00:00.000000
 1970-01-01 01:00:00.000000 BST
 0.000000
 1970-01-01 00:00:00.000000
-1970-01-01 01:00:00.000000 BST
+1970-01-01 00:00:00.000000 GMT
 32590299105.215000
 3002-09-30 12:51:45.215000
-3002-09-30 13:51:45.215000 BST
+3002-09-30 12:51:45.215000 GMT
 1288014663.150000
 2010-10-25 13:51:03.150000
-2010-10-25 14:51:03.150000 BST
+2010-10-25 13:51:03.150000 GMT
 0.000000
 1970-01-01 00:00:00.000000
 1970-01-01 01:00:00.000000 BST
@@ -139,13 +139,13 @@
 3769-12-05 03:13:03.000000 GMT
 0.000000
 1970-01-01 00:00:00.000000
-1970-01-01 01:00:00.000000 BST
+1970-01-01 00:00:00.000000 GMT
 1288014663.000000
 2010-10-25 13:51:03.000000
-2010-10-25 14:51:03.000000 BST
+2010-10-25 13:51:03.000000 GMT
 32590299105.000000
 3002-09-30 12:51:45.000000
-3002-09-30 13:51:45.000000 BST
+3002-09-30 12:51:45.000000 GMT
 ### All msg-id types, all zones,  localhost_number = 20
 ### All msg-id types, all zones,  base=36
 0.000000
@@ -153,13 +153,13 @@
 1970-01-01 01:00:00.000000 BST
 0.000000
 1970-01-01 00:00:00.000000
-1970-01-01 01:00:00.000000 BST
+1970-01-01 00:00:00.000000 GMT
 2176782335.972000
 2038-12-24 05:45:35.972000
 2038-12-24 05:45:35.972000 GMT
 102953955.999000
 1973-04-06 14:19:15.999000
-1973-04-06 15:19:15.999000 BST
+1973-04-06 14:19:15.999000 GMT
 0.000000
 1970-01-01 00:00:00.000000
 1970-01-01 01:00:00.000000 BST
@@ -168,10 +168,10 @@
 1973-04-06 15:19:15.000000 BST
 0.000000
 1970-01-01 00:00:00.000000
-1970-01-01 01:00:00.000000 BST
+1970-01-01 00:00:00.000000 GMT
 102953955.000000
 1973-04-06 14:19:15.000000
-1973-04-06 15:19:15.000000 BST
+1973-04-06 14:19:15.000000 GMT
 2176782335.000000
 2038-12-24 05:45:35.000000
 2038-12-24 05:45:35.000000 GMT
@@ -181,13 +181,13 @@
 1970-01-01 01:00:00.000000 BST
 0.000000
 1970-01-01 00:00:00.000000
-1970-01-01 01:00:00.000000 BST
+1970-01-01 00:00:00.000000 GMT
 32590299105.999500
 3002-09-30 12:51:45.999500
-3002-09-30 13:51:45.999500 BST
+3002-09-30 12:51:45.999500 GMT
 1288014663.915000
 2010-10-25 13:51:03.915000
-2010-10-25 14:51:03.915000 BST
+2010-10-25 13:51:03.915000 GMT
 0.000000
 1970-01-01 00:00:00.000000
 1970-01-01 01:00:00.000000 BST
@@ -199,13 +199,13 @@
 3769-12-05 03:13:03.000000 GMT
 0.000000
 1970-01-01 00:00:00.000000
-1970-01-01 01:00:00.000000 BST
+1970-01-01 00:00:00.000000 GMT
 1288014663.000000
 2010-10-25 13:51:03.000000
-2010-10-25 14:51:03.000000 BST
+2010-10-25 13:51:03.000000 GMT
 32590299105.000000
 3002-09-30 12:51:45.000000
-3002-09-30 13:51:45.000000 BST
+3002-09-30 12:51:45.000000 GMT
 
 ******** SERVER ********
 ### A Message ID as it appears in an email: