diff options
| author | Morten Johan Sørvig <morten.sorvig@qt.io> | 2018-06-04 10:45:14 +0200 |
|---|---|---|
| committer | Morten Johan Sørvig <morten.sorvig@qt.io> | 2018-06-04 10:45:14 +0200 |
| commit | 3ca5f33c8b9c273f0169ec4c11417328f8071e97 (patch) | |
| tree | 155da80482fb4593ca074f7a1bf9b22d031dba4a /tests/auto/qml/ecmascripttests/test262.py | |
| parent | 5f4698c4e7952d64e78e3a06de5ac28d68415b19 (diff) | |
| parent | b7a1bcd83a8f68185b617b860cef6f2d2d7c8d9b (diff) | |
Merge remote-tracking branch 'gerrit/5.11' into wip/webassembly
Change-Id: I7556ac62fd8e1aeb99186c929f1225f02f9d2430
Diffstat (limited to 'tests/auto/qml/ecmascripttests/test262.py')
| -rwxr-xr-x | tests/auto/qml/ecmascripttests/test262.py | 2 |
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() |