1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test: Mark tst_QSettings::ctor() and tst_QSettings::rainersSyncBugOnMac(native) as XFAIL

Browse Source 
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:
Sergio Ahumada 2013-08-06 10:34:19 +02:00 committed by The Qt Project
parent 0b62a5d3c9
commit f8ce891d22
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/auto/corelib/io/qsettings/tst_qsettings.cpp
View File

@ -513,12 +513,20 @@ void tst_QSettings::ctor()
QSettings settings5(format, QSettings::UserScope, "SoftWare.ORG", "killerApp"); QSettings settings5(format, QSettings::UserScope, "SoftWare.ORG", "killerApp");
if (format == QSettings::NativeFormat) { if (format == QSettings::NativeFormat) {
#if defined(Q_OS_WIN) || defined(Q_OS_DARWIN) #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")); QCOMPARE(settings5.value("key 1").toString(), QString("gurgle"));
#else #else
QVERIFY(!settings5.contains("key 1")); QVERIFY(!settings5.contains("key 1"));
#endif #endif
} else { } else {
#if defined(Q_OS_WIN) || defined(Q_OS_DARWIN) #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")); QCOMPARE(settings5.value("key 1").toString(), QString("gurgle"));
#else #else
QVERIFY(!settings5.contains("key 1")); QVERIFY(!settings5.contains("key 1"));
@ -3162,6 +3170,10 @@ void tst_QSettings::rainersSyncBugOnMac()
{ {
QSettings s3(format, QSettings::UserScope, "software.org", "KillerAPP"); 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); QCOMPARE(s3.value("key1", 30).toInt(), 25);
} }
} }