diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2018-07-03 17:44:10 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2018-07-04 07:06:53 +0000 |
| commit | 64d6b82bf76014403e48ae139d88eb858ada008a (patch) | |
| tree | 43f1fbdea94f54f72920bcc4ded9de52ae318016 /tests | |
| parent | 85913b4afcee5ff0b0fa7d375ae735615b03b53d (diff) | |
Fix tst_QLocale's mis-use of QSKIP() to use qDebug() instead
QSKIP() discards the whole test it appears in; so is not the right way
to announce that (and why) the test has just skipped a few sub-tests.
This was concealing a later failure on macOS, here fixed.
This matches an earlier fix for tst_QDateTime.
Change-Id: Idaf34a9d60d84202fd41d15455209457cc281f60
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/corelib/tools/qlocale/tst_qlocale.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp b/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp index 884cff553c..4131c44c84 100644 --- a/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp +++ b/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp @@ -1546,12 +1546,15 @@ void tst_QLocale::formatTimeZone() #endif // Q_OS_WIN QCOMPARE(enUS.toString(dt5, "t"), QLatin1String("CEST")); } else { - QSKIP("You must test using Central European (CET/CEST) time zone, e.g. TZ=Europe/Oslo"); + qDebug("(Skipped some CET-only tests)"); } #ifdef Q_OS_ANDROID // Only reports (general) zones as offsets (QTBUG-68837) const QString cet(QStringLiteral("GMT+01:00")); const QString cest(QStringLiteral("GMT+02:00")); +#elif defined Q_OS_DARWIN + const QString cet(QStringLiteral("GMT+1")); + const QString cest(QStringLiteral("GMT+2")); #else const QString cet(QStringLiteral("CET")); const QString cest(QStringLiteral("CEST")); |