From f8ce891d22ebf8e053c0772ce66f3bbad1849a3c Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Tue, 6 Aug 2013 10:34:19 +0200 Subject: test: Mark tst_QSettings::ctor() and tst_QSettings::rainersSyncBugOnMac(native) as XFAIL Mark some tests as expected failures on OS X 10.8 - tst_QSettings::ctor(native) - tst_QSettings::ctor(ini) - tst_QSettings::ctor(custom1) - tst_QSettings::ctor(custom2) - tst_QSettings::rainersSyncBugOnMac(native) Task-number: QTBUG-32655 Change-Id: I54928d991a8ccf300b40747feaa6fda9d124781b Reviewed-by: Gabriel de Dietrich --- tests/auto/corelib/io/qsettings/tst_qsettings.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'tests/auto') diff --git a/tests/auto/corelib/io/qsettings/tst_qsettings.cpp b/tests/auto/corelib/io/qsettings/tst_qsettings.cpp index c2909cf7c5..aec8d1b241 100644 --- a/tests/auto/corelib/io/qsettings/tst_qsettings.cpp +++ b/tests/auto/corelib/io/qsettings/tst_qsettings.cpp @@ -513,12 +513,20 @@ void tst_QSettings::ctor() QSettings settings5(format, QSettings::UserScope, "SoftWare.ORG", "killerApp"); if (format == QSettings::NativeFormat) { #if defined(Q_OS_WIN) || defined(Q_OS_DARWIN) +# ifdef Q_OS_MACX + if (QSysInfo::MacintoshVersion == QSysInfo::MV_10_8) + QEXPECT_FAIL("native", "See QTBUG-32655", Continue); +# endif // Q_OS_MACX QCOMPARE(settings5.value("key 1").toString(), QString("gurgle")); #else QVERIFY(!settings5.contains("key 1")); #endif } else { #if defined(Q_OS_WIN) || defined(Q_OS_DARWIN) +# ifdef Q_OS_MACX + if (QSysInfo::MacintoshVersion == QSysInfo::MV_10_8) + QEXPECT_FAIL("", "See QTBUG-32655", Continue); +# endif // Q_OS_MACX QCOMPARE(settings5.value("key 1").toString(), QString("gurgle")); #else QVERIFY(!settings5.contains("key 1")); @@ -3162,6 +3170,10 @@ void tst_QSettings::rainersSyncBugOnMac() { QSettings s3(format, QSettings::UserScope, "software.org", "KillerAPP"); +#ifdef Q_OS_MACX + if (QSysInfo::MacintoshVersion == QSysInfo::MV_10_8) + QEXPECT_FAIL("native", "See QTBUG-32655", Continue); +#endif QCOMPARE(s3.value("key1", 30).toInt(), 25); } } -- cgit v1.2.3