Force the time zone to GMT in the cookie tests in case the user is

using one of the so-called 'right' time zones that take into account
leap seconds, which causes the tests to fail (as reported by
Daniel Black in bug report #1745964).

5 files changed, 30 insertions, 0 deletions

diff --git a/tests/data/test31 b/tests/data/test31
index 080071f13..33ed617ff 100644
--- a/tests/data/test31
+++ b/tests/data/test31
@@ -39,6 +39,12 @@ http
  <name>
 HTTP with weirdly formatted cookies and cookiejar storage
  </name>
+# Explicitly set the time zone to a known good one, in case the user is
+# using one of the 'right' zones that take into account leap seconds
+# which causes the cookie expiry times to be different.
+<setenv>
+TZ=GMT
+</setenv>
  <command>
 http://%HOSTIP:%HTTPPORT/we/want/31 -b none -c log/jar31.txt
 </command>
diff --git a/tests/data/test46 b/tests/data/test46
index de60f7cc7..56f47861d 100644
--- a/tests/data/test46
+++ b/tests/data/test46
@@ -34,6 +34,12 @@ http
  <name>
 HTTP, get cookies and store in cookie jar
  </name>
+# Explicitly set the time zone to a known good one, in case the user is
+# using one of the 'right' zones that take into account leap seconds
+# which causes the cookie expiry times to be different from what we expect.
+<setenv>
+TZ=GMT
+</setenv>
  <command>
 %HOSTIP:%HTTPPORT/want/46 -c log/jar46 -b log/injar46
 </command>
diff --git a/tests/data/test506 b/tests/data/test506
index 65a2758d5..89860c318 100644
--- a/tests/data/test506
+++ b/tests/data/test506
@@ -47,6 +47,12 @@ http
 <name>
 HTTP with shared cookie list (and dns cache)
 </name>
+# Explicitly set the time zone to a known good one, in case the user is
+# using one of the 'right' zones that take into account leap seconds
+# which causes the cookie expiry times to be different.
+<setenv>
+TZ=GMT
+</setenv>
 <tool>
 lib506
 </tool>
diff --git a/tests/data/test517 b/tests/data/test517
index 8673139ce..bd9d77b29 100644
--- a/tests/data/test517
+++ b/tests/data/test517
@@ -17,6 +17,12 @@ lib517
  <name>
 curl_getdate() testing
  </name>
+# Explicitly set the time zone to a known good one, in case the user is
+# using one of the 'right' zones that take into account leap seconds
+# which causes the cookie expiry times to be different.
+<setenv>
+TZ=GMT
+</setenv>
  <command>
 nothing
 </command>
diff --git a/tests/data/test61 b/tests/data/test61
index c776c9f82..93c95d38e 100644
--- a/tests/data/test61
+++ b/tests/data/test61
@@ -35,6 +35,12 @@ http
  <name>
 HTTP with various cookies and custom Host:
  </name>
+# Explicitly set the time zone to a known good one, in case the user is
+# using one of the 'right' zones that take into account leap seconds
+# which causes the cookie expiry times to be different.
+<setenv>
+TZ=GMT
+</setenv>
  <command>
 http://%HOSTIP:%HTTPPORT/we/want/61 -c log/jar61.txt -H "Host: www.host.foo.com"
 </command>