diff options
author | Edward Welbourne <edward.welbourne@qt.io> | 2018-08-24 17:03:03 +0200 |
---|---|---|
committer | Tony Sarajärvi <tony.sarajarvi@qt.io> | 2018-08-24 17:30:01 +0000 |
commit | bd42e2f0cebb2fe8de77a054e9d30aa803749a61 (patch) | |
tree | ce18557f4ae149f3075f53e91ee07f98a77fa538 /tests/auto/corelib | |
parent | dc7e775c9c6ecc66f76af8139b8dfc3ee101c7ff (diff) |
Blacklist two tests on macOS that a planned CI change shall break
We have #if-ery on Q_OS_DARWIN controlling an expectation of gettign
"GMT+1" and "GMT+2" instead of "CET" and "CEST" in two tests; this
turns out to not be a deficiency of macOS so much as of how we
configure Coin's VMs. While we fix that, we need to ignore failures
in these tests, so that we can pull the #if-ery out and clear the
blacklist once the VMs are set up properly.
Task-number: QTBUG-70149
Change-Id: If3577200cf980b3329161ab3eea7bd2e9d0124e0
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Diffstat (limited to 'tests/auto/corelib')
-rw-r--r-- | tests/auto/corelib/tools/qdatetime/BLACKLIST | 2 | ||||
-rw-r--r-- | tests/auto/corelib/tools/qlocale/BLACKLIST | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/tests/auto/corelib/tools/qdatetime/BLACKLIST b/tests/auto/corelib/tools/qdatetime/BLACKLIST new file mode 100644 index 0000000000..3a42ee066b --- /dev/null +++ b/tests/auto/corelib/tools/qdatetime/BLACKLIST @@ -0,0 +1,2 @@ +[timeZoneAbbreviation] +osx diff --git a/tests/auto/corelib/tools/qlocale/BLACKLIST b/tests/auto/corelib/tools/qlocale/BLACKLIST new file mode 100644 index 0000000000..3eac7c10ed --- /dev/null +++ b/tests/auto/corelib/tools/qlocale/BLACKLIST @@ -0,0 +1,2 @@ +[formatTimeZone] +osx |