From bc69fd1dfe30876909091d93a07640a498a24c0c Mon Sep 17 00:00:00 2001 From: Marko Kangas Date: Fri, 13 Feb 2015 13:01:57 +0200 Subject: Skip instead of entirely excluding tests with disabled features Properly QSKIP tests that use disabled QProcess and symlink features instead of excluding them silently by #ifdef. Other reason is that moc doesn't respect QT_NO_* defines in class definition which causes build issues on some platforms. Change-Id: I041020f7452f7d36c7ec8a5866a4ba5eb23d1f94 Reviewed-by: Oswald Buddenhagen Reviewed-by: Jason McDonald --- tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp') diff --git a/tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp b/tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp index 05546eb2b7..62e183f619 100644 --- a/tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp +++ b/tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp @@ -219,10 +219,8 @@ private slots: void fileTimes(); void fileTimes_oldFile(); -#ifndef Q_NO_SYMLINKS void isSymLink_data(); void isSymLink(); -#endif void isHidden_data(); void isHidden(); @@ -1206,9 +1204,9 @@ void tst_QFileInfo::fileTimes_oldFile() #endif } -#ifndef Q_NO_SYMLINKS void tst_QFileInfo::isSymLink_data() { +#ifndef Q_NO_SYMLINKS QFile::remove("link.lnk"); QFile::remove("brokenlink.lnk"); QFile::remove("dummyfile"); @@ -1228,10 +1226,14 @@ void tst_QFileInfo::isSymLink_data() QTest::newRow("existent file") << m_sourceFile << false << ""; QTest::newRow("link") << "link.lnk" << true << QFileInfo(m_sourceFile).absoluteFilePath(); QTest::newRow("broken link") << "brokenlink.lnk" << true << QFileInfo("dummyfile").absoluteFilePath(); +#endif } void tst_QFileInfo::isSymLink() { +#ifdef Q_NO_SYMLINKS + QSKIP("No symlink support", SkipAll); +#else QFETCH(QString, path); QFETCH(bool, isSymLink); QFETCH(QString, linkTarget); @@ -1239,8 +1241,8 @@ void tst_QFileInfo::isSymLink() QFileInfo fi(path); QCOMPARE(fi.isSymLink(), isSymLink); QCOMPARE(fi.symLinkTarget(), linkTarget); -} #endif +} void tst_QFileInfo::isHidden_data() { -- cgit v1.2.3