summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEdward Welbourne <edward.welbourne@qt.io>2018-04-19 18:29:30 +0200
committerJani Heikkinen <jani.heikkinen@qt.io>2019-04-02 10:10:09 +0000
commit9d6d2ee217fc87325d1a45cfad95168b9da57218 (patch)
tree82ae1718fecf243602ea7760e7b567497b6e44dd
parent24af53cfeb998dcf3a6c6d49d312e50809a4a324 (diff)
Use Los Angeles to represent PST8PDT, not Vancouver
This amends commit 24af53cfeb998dcf3a6c6d49d312e50809a4a324. The very last test (15.9.5.43-0-8) in the ES test-suite relies on constructing a time *just* outside the valid range, to provoke (and check it gets) a RangeError. However, it uses the current time-zone offset in computing this; and the local time -> UTC conversion in the Date constructor uses the zone information for the zone at the given time. The TZ db uses each zone's local mean solar time for the period before a formal zone was introduced; and Vancouver is further West than the nominal meridian for its zone. The test code throws in an hour's correction in case it's run in daylight-saving time, which would put the test time, when run during standard time, an hour (and a millisecond, rather than just the millisecond) outside the valid Date range, so as to ensure it's still a ms outside when the test is run during DST. However, the 12m28s mean solar offset overcomes the 1ms and puts the time back in range durign DST (but still 47m32.001s outside during standard time, which is why this problem only surfaced when North America entered summer time). Fortunately, Los Angeles is further East than the meridian in question, and uses the same zone. Task-number: QTBUG-67010 Change-Id: I58fd7bf14366ebe5842b8abd7e6802c9c78ca27e Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> (cherry picked from commit fb20d2f7b149725b0fcc8e5bbb377cd6dababc9b) Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
-rwxr-xr-xtests/auto/qml/ecmascripttests/test262.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/qml/ecmascripttests/test262.py b/tests/auto/qml/ecmascripttests/test262.py
index ae4c54df9d..e055c7a8e7 100755
--- a/tests/auto/qml/ecmascripttests/test262.py
+++ b/tests/auto/qml/ecmascripttests/test262.py
@@ -555,7 +555,7 @@ def Main():
# Uncomment the next line for more logging info.
#logging.basicConfig(level=logging.DEBUG)
# Some date tests rely on being run in pacific time and the USA's locale:
- os.environ["TZ"] = "America/Vancouver"
+ os.environ["TZ"] = "America/Los_Angeles" # it *matters* that this is (7m8s) *East* of PST's nominal meridian !
os.environ["LANG"] = "en_US.UTF-8"
os.environ["LC_TIME"] = "en_US.UTF-8"
parser = BuildOptions()