diff options
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/qfileinfo/tst_qfileinfo.cpp | 4 | ||||
| -rw-r--r-- | tests/auto/symbols/tst_symbols.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/qfileinfo/tst_qfileinfo.cpp b/tests/auto/qfileinfo/tst_qfileinfo.cpp index 910ed97..5ec721b 100644 --- a/tests/auto/qfileinfo/tst_qfileinfo.cpp +++ b/tests/auto/qfileinfo/tst_qfileinfo.cpp @@ -70,7 +70,7 @@ # define SRCDIR "" #endif -extern Q_AUTOTEST_EXPORT bool isLikelyToBeNfs(int /* handle */); +extern Q_AUTOTEST_EXPORT bool qIsLikelyToBeNfs(int /* handle */); //TESTED_CLASS= //TESTED_FILES= @@ -942,7 +942,7 @@ void tst_QFileInfo::fileTimes() #endif QVERIFY(file.open(QFile::WriteOnly | QFile::Text)); #ifdef Q_OS_UNIX - if (isLikelyToBeNfs(file.handle())) + if (qIsLikelyToBeNfs(file.handle())) QSKIP("This Test doesn't work on NFS", SkipAll); #endif QTextStream ts(&file); diff --git a/tests/auto/symbols/tst_symbols.cpp b/tests/auto/symbols/tst_symbols.cpp index 28970eb..1572a5f 100644 --- a/tests/auto/symbols/tst_symbols.cpp +++ b/tests/auto/symbols/tst_symbols.cpp @@ -443,7 +443,7 @@ void tst_Symbols::prefix() # if defined(Q_OS_LINUX) && defined(Q_CC_INTEL) QEXPECT_FAIL("", "linux-icc* incorrectly exports some QtWebkit symbols, waiting for a fix from Intel.", Continue); # endif - QVERIFY2(!isFailed, "Libraries contain non-prefixed symbols. See Debug output :)"); + QVERIFY2(!isFailed, "Libraries contain non-prefixed symbols. See Debug output above."); #else QSKIP("Linux-specific test", SkipAll); #endif |