From 048d28a674cd1cbbc738a3045ae967323a9d41e9 Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Sun, 21 Oct 2012 23:26:44 +0200 Subject: test: Remove QSKIP from tst_QSettings::fileName() Change-Id: I24ed2d182faff989f62f192246ebf95ca492c10d Reviewed-by: J-P Nurmi --- tests/auto/corelib/io/qsettings/tst_qsettings.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tests/auto/corelib/io/qsettings/tst_qsettings.cpp b/tests/auto/corelib/io/qsettings/tst_qsettings.cpp index 914f88ecda..84fbfb4131 100644 --- a/tests/auto/corelib/io/qsettings/tst_qsettings.cpp +++ b/tests/auto/corelib/io/qsettings/tst_qsettings.cpp @@ -106,7 +106,9 @@ private slots: void testThreadSafety(); void testEmptyData(); void testResourceFiles(); +#ifdef Q_OS_MAC void fileName(); +#endif void isWritable_data(); void isWritable(); void registerFormat(); @@ -2576,9 +2578,10 @@ void tst_QSettings::testCaseSensitivity() } } +#ifdef Q_OS_MAC +// Please write a fileName() test for the other platforms void tst_QSettings::fileName() { -#ifdef Q_OS_MAC QSettings s1(QSettings::UserScope, "Apple", "Console"); QSettings s2(QSettings::UserScope, "Apple"); QSettings s3(QSettings::SystemScope, "Apple", "Console"); @@ -2642,10 +2645,8 @@ void tst_QSettings::fileName() QSettings s21(QSettings::SystemScope, QLatin1String(" ") + QChar(0xbd) + QLatin1String("Foo//:/Bar,,, Baz!()#"), "Console"); QCOMPARE(s21.fileName(), QString("/Library/Preferences/com.foo-bar-baz.Console.plist")); -#else - QSKIP("Please write a fileName() test for the other platforms"); -#endif } +#endif void tst_QSettings::isWritable_data() { -- cgit v1.2.3