diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2018-07-17 18:20:12 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2018-07-17 18:20:12 +0000 |
| commit | cc5d8168001e652c045ff42685edf257ce00603c (patch) | |
| tree | 6320f169d621bed128f08d92676035a8e2f2ab23 /tests/auto/corelib/tools | |
| parent | a9dfe71cca38e6b62445292ed2c6ec1c8224430a (diff) | |
| parent | 1783fca89768a9d503d886673643dc4542ec467f (diff) | |
Merge "Merge remote-tracking branch 'origin/5.11' into dev" into refs/staging/dev
Diffstat (limited to 'tests/auto/corelib/tools')
| -rw-r--r-- | tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp | 5 | ||||
| -rw-r--r-- | tests/auto/corelib/tools/qlocale/tst_qlocale.cpp | 5 | ||||
| -rw-r--r-- | tests/auto/corelib/tools/qpointf/tst_qpointf.cpp | 3 |
3 files changed, 11 insertions, 2 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() #endif 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")); #else const QString cet(QStringLiteral("CET")); const QString cest(QStringLiteral("CEST")); diff --git a/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp b/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp index 06706e7ee8..b76851a0ec 100644 --- a/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp +++ b/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp @@ -1582,12 +1582,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")); diff --git a/tests/auto/corelib/tools/qpointf/tst_qpointf.cpp b/tests/auto/corelib/tools/qpointf/tst_qpointf.cpp index 579991a912..d4ccdf7ba6 100644 --- a/tests/auto/corelib/tools/qpointf/tst_qpointf.cpp +++ b/tests/auto/corelib/tools/qpointf/tst_qpointf.cpp @@ -450,6 +450,9 @@ void tst_QPointF::compare() p3 -= QPointF(0.1, 0.1); QVERIFY(p3 == QPointF()); + + // Test we can compare one dimension with hard zero + QVERIFY(QPointF(1.9543e-14, -32.0) == QPointF(0.0, -32.0)); } QTEST_MAIN(tst_QPointF) |