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

Test: remove QSKIP from tst_QStringList::initializeList()

Browse Source 
Instead omit the whole test when Q_COMPILER_INITIALIZER_LISTS
is not defined.

Change-Id: I34017484a027b95a2677e1c4cb9231fa2aeb5680
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
This commit is contained in:
Caroline Chao 2012-10-18 15:57:13 +02:00 committed by The Qt Project
parent 33aea0cc1c
commit f948294f5e
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tests/auto/corelib/tools/qstringlist/tst_qstringlist.cpp
View File

@ -72,7 +72,9 @@ private slots:
void joinChar() const; void joinChar() const;
void joinChar_data() const; void joinChar_data() const;
#ifdef Q_COMPILER_INITIALIZER_LISTS
void initializeList() const; void initializeList() const;
#endif
}; };
extern const char email[]; extern const char email[];
@ -422,16 +424,16 @@ void tst_QStringList::joinEmptiness() const
QVERIFY(string.isNull()); QVERIFY(string.isNull());
} }
#ifdef Q_COMPILER_INITIALIZER_LISTS
// C++0x support is required
void tst_QStringList::initializeList() const void tst_QStringList::initializeList() const
{ {
#ifdef Q_COMPILER_INITIALIZER_LISTS
QStringList v1{QLatin1String("hello"),"world",QString::fromLatin1("plop")}; QStringList v1{QLatin1String("hello"),"world",QString::fromLatin1("plop")};
QCOMPARE(v1, (QStringList() << "hello" << "world" << "plop")); QCOMPARE(v1, (QStringList() << "hello" << "world" << "plop"));
QCOMPARE(v1, (QStringList{"hello","world","plop"})); QCOMPARE(v1, (QStringList{"hello","world","plop"}));
#else
QSKIP("Require C++0x support, pass the right flag to the compiler");
#endif
} }
#endif
QTEST_APPLESS_MAIN(tst_QStringList) QTEST_APPLESS_MAIN(tst_QStringList)
#include "tst_qstringlist.moc" #include "tst_qstringlist.moc"