path: root/tests
diff options
authorEdward Welbourne <>2018-06-14 14:01:45 +0200
committerEdward Welbourne <>2018-07-04 07:07:04 +0000
commit9fc6b021f9327b17008576e79a1f45c85b1b2d6e (patch)
tree0f8590a7473a6256b78a14fa14568f4a3ab6756c /tests
parent64d6b82bf76014403e48ae139d88eb858ada008a (diff)
Fix a 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. Change-Id: I9b07208413b9e101569a22505ad41f07ade4062b Reviewed-by: MÃ¥rten Nordheim <>
Diffstat (limited to 'tests')
1 files changed, 4 insertions, 1 deletions
diff --git a/tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp b/tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp
index 10856a4d57..d460beafde 100644
--- a/tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp
+++ b/tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp
@@ -2723,12 +2723,15 @@ void tst_QDateTime::timeZoneAbbreviation()
QCOMPARE(dt5.timeZoneAbbreviation(), QStringLiteral("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"));
const QString cet(QStringLiteral("CET"));
const QString cest(QStringLiteral("CEST"));