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 <gabriel.dedietrich@digia.com>
This commit is contained in:
parent
0b62a5d3c9
commit
f8ce891d22
@ -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);
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user