diff options
Diffstat (limited to 'tests/auto/corelib')
23 files changed, 49 insertions, 53 deletions
diff --git a/tests/auto/corelib/animation/qpropertyanimation/tst_qpropertyanimation.cpp b/tests/auto/corelib/animation/qpropertyanimation/tst_qpropertyanimation.cpp index 519eab08c0..309f77c7ce 100644 --- a/tests/auto/corelib/animation/qpropertyanimation/tst_qpropertyanimation.cpp +++ b/tests/auto/corelib/animation/qpropertyanimation/tst_qpropertyanimation.cpp @@ -261,7 +261,7 @@ void tst_QPropertyAnimation::statesAndSignals() anim->setCurrentTime(101); if (uncontrolled) - QSKIP("Uncontrolled animations don't handle looping", SkipSingle); + QSKIP("Uncontrolled animations don't handle looping"); QCOMPARE(currentLoopSpy.count(), 1); QCOMPARE(anim->currentLoop(), 1); diff --git a/tests/auto/corelib/codecs/qtextcodec/tst_qtextcodec.cpp b/tests/auto/corelib/codecs/qtextcodec/tst_qtextcodec.cpp index 96901f334e..c3002a81bc 100644 --- a/tests/auto/corelib/codecs/qtextcodec/tst_qtextcodec.cpp +++ b/tests/auto/corelib/codecs/qtextcodec/tst_qtextcodec.cpp @@ -341,14 +341,14 @@ void tst_QTextCodec::codecForLocale() "%A%a%B%b%Z", localtime(&t)); if (r == 0) - QSKIP("strftime() failed", SkipAll); + QSKIP("strftime() failed"); originalLocaleEncodedTimeString.resize(r); QString unicodeTimeString = codec->toUnicode(originalLocaleEncodedTimeString); QByteArray localeEncodedTimeString = codec->fromUnicode(unicodeTimeString); QCOMPARE(localeEncodedTimeString, originalLocaleEncodedTimeString); #else - QSKIP("This test is not implemented on Windows", SkipAll); + QSKIP("This test is not implemented on Windows"); #endif // find a codec that is not the codecForLocale() @@ -361,7 +361,7 @@ void tst_QTextCodec::codecForLocale() } } if (!codec2) { - QSKIP("Could not find a codec that is not already the codecForLocale()", SkipAll); + QSKIP("Could not find a codec that is not already the codecForLocale()"); } // set it, codecForLocale() should return it now diff --git a/tests/auto/corelib/concurrent/qtconcurrentfilter/tst_qtconcurrentfilter.cpp b/tests/auto/corelib/concurrent/qtconcurrentfilter/tst_qtconcurrentfilter.cpp index 42ab8b5fc9..eae7a5c6e5 100644 --- a/tests/auto/corelib/concurrent/qtconcurrentfilter/tst_qtconcurrentfilter.cpp +++ b/tests/auto/corelib/concurrent/qtconcurrentfilter/tst_qtconcurrentfilter.cpp @@ -69,7 +69,7 @@ private slots: #ifdef QT_NO_CONCURRENT_FILTER void tst_QtConcurrentFilter::initTestCase() { - QSKIP("This test is skipped for gcc 3.x", SkipAll); + QSKIP("This test is skipped for gcc 3.x"); } #else @@ -1512,7 +1512,7 @@ void tst_QtConcurrentFilter::noDetatch() void tst_QtConcurrentFilter::stlContainers() { #if defined(_MSC_VER) && _MSC_VER >= 1600 - QSKIP("Test does not compile with MSVC 2010 (see QTBUG-18996)", SkipAll); + QSKIP("Test does not compile with MSVC 2010 (see QTBUG-18996)"); #else std::vector<int> vector; vector.push_back(1); diff --git a/tests/auto/corelib/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp b/tests/auto/corelib/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp index a4634e0c8f..5cbdeccf11 100644 --- a/tests/auto/corelib/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp +++ b/tests/auto/corelib/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp @@ -88,7 +88,7 @@ public slots: #ifdef QT_NO_CONCURRENT_FILTER void tst_QtConcurrentFilter::initTestCase() { - QSKIP("This test is skipped for gcc 3.x", SkipAll); + QSKIP("This test is skipped for gcc 3.x"); } #else diff --git a/tests/auto/corelib/global/qnumeric/tst_qnumeric.cpp b/tests/auto/corelib/global/qnumeric/tst_qnumeric.cpp index 8eb4e468a1..697ddfc9d2 100644 --- a/tests/auto/corelib/global/qnumeric/tst_qnumeric.cpp +++ b/tests/auto/corelib/global/qnumeric/tst_qnumeric.cpp @@ -93,7 +93,7 @@ void tst_QNumeric::qNan() #if defined( __INTEL_COMPILER) QCOMPARE((0 > nan), false); QCOMPARE((0 < nan), false); - QSKIP("This fails due to a bug in the Intel Compiler", SkipAll); + QSKIP("This fails due to a bug in the Intel Compiler"); #else if (0 > nan) QFAIL("compiler thinks 0 > nan"); diff --git a/tests/auto/corelib/io/qdatastream/tst_qdatastream.cpp b/tests/auto/corelib/io/qdatastream/tst_qdatastream.cpp index 786051c53c..2745d985a4 100644 --- a/tests/auto/corelib/io/qdatastream/tst_qdatastream.cpp +++ b/tests/auto/corelib/io/qdatastream/tst_qdatastream.cpp @@ -967,7 +967,7 @@ void tst_QDataStream::stream_QBrush_data() void tst_QDataStream::stream_QBrush() { if (QString(QTest::currentDataTag()).endsWith("6")) - QSKIP("Custom brushes don't seem to be supported with QDataStream", SkipSingle); + QSKIP("Custom brushes don't seem to be supported with QDataStream"); STREAM_IMPL(QBrush); } diff --git a/tests/auto/corelib/io/qdir/tst_qdir.cpp b/tests/auto/corelib/io/qdir/tst_qdir.cpp index 79e19acbce..07d2afd29c 100644 --- a/tests/auto/corelib/io/qdir/tst_qdir.cpp +++ b/tests/auto/corelib/io/qdir/tst_qdir.cpp @@ -786,7 +786,7 @@ void tst_QDir::canonicalPath() else srcPath = QDir("."); if (srcPath.absolutePath() != srcPath.canonicalPath()) - QSKIP("This test does not work if this directory path consists of symlinks.", SkipAll); + QSKIP("This test does not work if this directory path consists of symlinks."); QString oldpwd = QDir::currentPath(); QDir::setCurrent(srcPath.absolutePath()); @@ -1435,7 +1435,7 @@ void tst_QDir::longFileName() QFile file(fileName); if (!file.open(QFile::WriteOnly)) - QSKIP("Cannot create long file names", SkipAll); + QSKIP("Cannot create long file names"); QFile file2(fileName); QVERIFY(file2.open(QFile::ReadOnly)); diff --git a/tests/auto/corelib/io/qfile/largefile/tst_largefile.cpp b/tests/auto/corelib/io/qfile/largefile/tst_largefile.cpp index f6321c7f79..5e5be42bdf 100644 --- a/tests/auto/corelib/io/qfile/largefile/tst_largefile.cpp +++ b/tests/auto/corelib/io/qfile/largefile/tst_largefile.cpp @@ -438,7 +438,7 @@ void tst_LargeFile::streamPositioning() #if defined(QT_LARGEFILE_SUPPORT) && defined(Q_CC_MSVC) && _MSC_VER < 1400 if (position >= (qint64)1 << 31) - QSKIP("MSVC 2003 doesn't have 64 bit versions of fseek/ftell.", SkipSingle); + QSKIP("MSVC 2003 doesn't have 64 bit versions of fseek/ftell."); #endif stream_ = QT_FOPEN("qt_largefile.tmp", "rb"); diff --git a/tests/auto/corelib/io/qfile/tst_qfile.cpp b/tests/auto/corelib/io/qfile/tst_qfile.cpp index 59c90f64ec..803b45c3b8 100644 --- a/tests/auto/corelib/io/qfile/tst_qfile.cpp +++ b/tests/auto/corelib/io/qfile/tst_qfile.cpp @@ -525,7 +525,7 @@ void tst_QFile::open() #if defined(Q_OS_UNIX) if (::getuid() == 0) // root and Chuck Norris don't care for file permissions. Skip. - QSKIP("Running this test as root doesn't make sense", SkipAll); + QSKIP("Running this test as root doesn't make sense"); #endif #if defined(Q_OS_WIN32) || defined(Q_OS_WINCE) @@ -1469,7 +1469,7 @@ void tst_QFile::largeUncFileSupport() { // 2) stdlib file handling. #if _MSC_VER <= 1310 - QSKIP("platform SDK for MSVC 2003 does not support large files", SkipAll); + QSKIP("platform SDK for MSVC 2003 does not support large files"); #endif QFile file; FILE *fh = fopen(QFile::encodeName(largeFile).data(), "rb"); @@ -1495,7 +1495,7 @@ void tst_QFile::largeUncFileSupport() void tst_QFile::tailFile() { - QSKIP("File change notifications are so far unsupported.", SkipAll); + QSKIP("File change notifications are so far unsupported."); QFile file("tail.txt"); QVERIFY(file.open(QFile::WriteOnly | QFile::Append)); @@ -1838,7 +1838,7 @@ void tst_QFile::largeFileSupport() QFAIL("Could not open file"); } } else { - QSKIP("Not enough space to run test", SkipSingle); + QSKIP("Not enough space to run test"); } } else { QFAIL("Could not determin disk space"); @@ -2134,7 +2134,7 @@ void tst_QFile::fullDisk() { QFile file("/dev/full"); if (!file.exists()) - QSKIP("/dev/full doesn't exist on this system", SkipAll); + QSKIP("/dev/full doesn't exist on this system"); QVERIFY(file.open(QIODevice::WriteOnly)); file.write("foobar", 6); @@ -2268,7 +2268,7 @@ void tst_QFile::virtualFile() #elif defined(Q_OS_FREEBSD) || defined(Q_OS_NETBSD) fname = "/proc/curproc/map"; #else - QSKIP("This platform does not have 0-sized virtual files", SkipAll); + QSKIP("This platform does not have 0-sized virtual files"); #endif // consistency check diff --git a/tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp b/tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp index 76c100163c..4adfb9fad8 100644 --- a/tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp +++ b/tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp @@ -622,7 +622,7 @@ void tst_QFileInfo::canonicalFilePath() (PtrCreateSymbolicLink)QLibrary::resolve(QLatin1String("kernel32"), "CreateSymbolicLinkW"); if (!ptrCreateSymbolicLink) { - QSKIP("Symbolic links aren't supported by FS", SkipAll); + QSKIP("Symbolic links aren't supported by FS"); } else { // CreateSymbolicLink can return TRUE & still fail to create the link, // the error code in that case is ERROR_PRIVILEGE_NOT_HELD (1314) @@ -630,11 +630,11 @@ void tst_QFileInfo::canonicalFilePath() BOOL ret = ptrCreateSymbolicLink((wchar_t*)QString("res").utf16(), (wchar_t*)QString("resources").utf16(), 1); DWORD dwErr = GetLastError(); if (!ret) - QSKIP("Symbolic links aren't supported by FS", SkipAll); + QSKIP("Symbolic links aren't supported by FS"); QString currentPath = QDir::currentPath(); bool is_res_Current = QDir::setCurrent("res"); if (!is_res_Current && dwErr == 1314) - QSKIP("Not enough privilages to create Symbolic links", SkipAll); + QSKIP("Not enough privilages to create Symbolic links"); QCOMPARE(is_res_Current, true); QCOMPARE(QFileInfo("file1").canonicalFilePath(), currentPath + "/resources/file1"); @@ -1001,7 +1001,7 @@ void tst_QFileInfo::fileTimes() QVERIFY(file.open(QFile::WriteOnly | QFile::Text)); #ifdef Q_OS_UNIX if (qIsLikelyToBeNfs(file.handle())) - QSKIP("This Test doesn't work on NFS", SkipAll); + QSKIP("This Test doesn't work on NFS"); #endif QTextStream ts(&file); ts << fileName << endl; @@ -1313,7 +1313,7 @@ void tst_QFileInfo::ntfsJunctionPointsAndSymlinks_data() //we need at least one data set for the test not to fail when skipping _data function QDir target("target"); QTest::newRow("dummy") << target.path() << false << "" << target.canonicalPath(); - QSKIP("symbolic links not supported by operating system",SkipSingle); + QSKIP("symbolic links not supported by operating system"); } { //Directory symlinks @@ -1348,7 +1348,7 @@ void tst_QFileInfo::ntfsJunctionPointsAndSymlinks_data() //we need at least one data set for the test not to assert fail when skipping _data function QDir target("target"); QTest::newRow("dummy") << target.path() << false << "" << target.canonicalPath(); - QSKIP("link not supported by FS or insufficient privilege", SkipSingle); + QSKIP("link not supported by FS or insufficient privilege"); } QVERIFY(file.exists()); @@ -1655,7 +1655,7 @@ void tst_QFileInfo::owner() qt_ntfs_permission_lookup = 1; #endif if (userName.isEmpty()) - QSKIP("Can't retrieve the user name", SkipAll); + QSKIP("Can't retrieve the user name"); QString fileName("ownertest.txt"); QVERIFY(!QFile::exists(fileName) || QFile::remove(fileName)); { diff --git a/tests/auto/corelib/io/qfilesystemwatcher/tst_qfilesystemwatcher.cpp b/tests/auto/corelib/io/qfilesystemwatcher/tst_qfilesystemwatcher.cpp index 3468390257..fef2b4675e 100644 --- a/tests/auto/corelib/io/qfilesystemwatcher/tst_qfilesystemwatcher.cpp +++ b/tests/auto/corelib/io/qfilesystemwatcher/tst_qfilesystemwatcher.cpp @@ -329,7 +329,7 @@ void tst_QFileSystemWatcher::watchDirectory() // recreate the file, we should not get any notification if (!QDir().mkdir("testDir")) - QSKIP("Failed to recreate directory, skipping final test.", SkipSingle); + QSKIP("Failed to recreate directory, skipping final test."); // qDebug() << "waiting max 5 seconds for notification for dir recreation to trigger"; timer.start(5000); @@ -467,7 +467,7 @@ void tst_QFileSystemWatcher::watchFileAndItsDirectory() QVERIFY(dirChangedSpy.count() < 2); if (backend == "dnotify") - QSKIP("dnotify is broken, skipping the rest of the test.", SkipSingle); + QSKIP("dnotify is broken, skipping the rest of the test."); fileChangedSpy.clear(); dirChangedSpy.clear(); diff --git a/tests/auto/corelib/io/qprocess/tst_qprocess.cpp b/tests/auto/corelib/io/qprocess/tst_qprocess.cpp index cb0d0149b6..0662f890e1 100644 --- a/tests/auto/corelib/io/qprocess/tst_qprocess.cpp +++ b/tests/auto/corelib/io/qprocess/tst_qprocess.cpp @@ -194,7 +194,7 @@ private: #ifdef QT_NO_PROCESS void tst_QProcess::initTestCase() { - QSKIP("This test requires QProcess support", SkipAll); + QSKIP("This test requires QProcess support"); } #else @@ -646,7 +646,7 @@ void tst_QProcess::exitStatus() #ifdef Q_OS_WIN if (exitStatus.contains(QProcess::CrashExit)) - QSKIP("This test opens a crash dialog on Windows", SkipSingle); + QSKIP("This test opens a crash dialog on Windows"); #endif QCOMPARE(exitStatus.count(), processList.count()); diff --git a/tests/auto/corelib/io/qprocessenvironment/tst_qprocessenvironment.cpp b/tests/auto/corelib/io/qprocessenvironment/tst_qprocessenvironment.cpp index 1827f8b2d7..00113631f5 100644 --- a/tests/auto/corelib/io/qprocessenvironment/tst_qprocessenvironment.cpp +++ b/tests/auto/corelib/io/qprocessenvironment/tst_qprocessenvironment.cpp @@ -297,7 +297,7 @@ void tst_QProcessEnvironment::putenv() qputenv(envname, "Hello, World"); QByteArray valAfter = qgetenv(envname); if (valAfter != "Hello, World") - QSKIP("Could not test: qputenv did not do its job", SkipAll); + QSKIP("Could not test: qputenv did not do its job"); QProcessEnvironment eAfter = QProcessEnvironment::systemEnvironment(); diff --git a/tests/auto/corelib/io/qsettings/tst_qsettings.cpp b/tests/auto/corelib/io/qsettings/tst_qsettings.cpp index 5d3e268d96..eabd4cd761 100644 --- a/tests/auto/corelib/io/qsettings/tst_qsettings.cpp +++ b/tests/auto/corelib/io/qsettings/tst_qsettings.cpp @@ -684,7 +684,7 @@ void tst_QSettings::testErrorHandling() { #if defined(Q_OS_UNIX) if (::getuid() == 0) - QSKIP("Running this test as root doesn't work, since file perms do not bother him", SkipAll); + QSKIP("Running this test as root doesn't work, since file perms do not bother him"); #else QFETCH(int, filePerms); QFETCH(int, dirPerms); @@ -2632,7 +2632,7 @@ 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", SkipAll); + QSKIP("Please write a fileName() test for the other platforms"); #endif } diff --git a/tests/auto/corelib/kernel/qeventloop/tst_qeventloop.cpp b/tests/auto/corelib/kernel/qeventloop/tst_qeventloop.cpp index 006266ca9d..7446e17f76 100644 --- a/tests/auto/corelib/kernel/qeventloop/tst_qeventloop.cpp +++ b/tests/auto/corelib/kernel/qeventloop/tst_qeventloop.cpp @@ -354,8 +354,7 @@ void tst_QEventLoop::throwInExec() qPrintable(QString( "Throwing exceptions in exec() won't work if %1 event dispatcher is used.\n" "Try running with QT_NO_GLIB=1 in environment." - ).arg(QString::fromLatin1(dispatcher))), - SkipAll + ).arg(QString::fromLatin1(dispatcher))) ); } #endif diff --git a/tests/auto/corelib/kernel/qtipc/qsharedmemory/qsystemlock/tst_qsystemlock.cpp b/tests/auto/corelib/kernel/qtipc/qsharedmemory/qsystemlock/tst_qsystemlock.cpp index a15e806d49..0613fbc058 100644 --- a/tests/auto/corelib/kernel/qtipc/qsharedmemory/qsystemlock/tst_qsystemlock.cpp +++ b/tests/auto/corelib/kernel/qtipc/qsharedmemory/qsystemlock/tst_qsystemlock.cpp @@ -190,7 +190,7 @@ void tst_QSystemLock::processes_data() */ void tst_QSystemLock::processes() { - QSKIP("This test takes about 15 minutes and needs to be trimmed down before we can re-enable it", SkipAll); + QSKIP("This test takes about 15 minutes and needs to be trimmed down before we can re-enable it"); QFETCH(int, readOnly); QFETCH(int, readWrite); diff --git a/tests/auto/corelib/kernel/qtipc/qsharedmemory/tst_qsharedmemory.cpp b/tests/auto/corelib/kernel/qtipc/qsharedmemory/tst_qsharedmemory.cpp index fe1d552708..100aca9d24 100644 --- a/tests/auto/corelib/kernel/qtipc/qsharedmemory/tst_qsharedmemory.cpp +++ b/tests/auto/corelib/kernel/qtipc/qsharedmemory/tst_qsharedmemory.cpp @@ -503,7 +503,7 @@ void tst_QSharedMemory::useTooMuchMemory() #if !defined(Q_OS_HPUX) && !defined(Q_OS_WINCE) void tst_QSharedMemory::attachTooMuch() { - QSKIP("disabled", SkipAll); + QSKIP("disabled"); QSharedMemory government(rememberKey("government")); QVERIFY(government.create(1024)); @@ -690,7 +690,7 @@ void tst_QSharedMemory::simpleThreadedProducerConsumer() rememberKey(QLatin1String("market")); #if defined Q_OS_HPUX && defined __ia64 - QSKIP("This test locks up on gravlaks.troll.no", SkipSingle); + QSKIP("This test locks up on gravlaks.troll.no"); #endif Producer p; diff --git a/tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp b/tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp index c6a71a303b..13b2938027 100644 --- a/tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp +++ b/tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp @@ -840,7 +840,7 @@ void tst_QDateTime::toTimeSpec() QCOMPARE(utc.toTimeSpec(Qt::UTC), local.toTimeSpec(Qt::UTC)); QCOMPARE(utc.toTimeSpec(Qt::LocalTime), local.toTimeSpec(Qt::LocalTime)); } else { - QSKIP("Not tested with timezone other than Central European (CET/CST)", SkipAll); + QSKIP("Not tested with timezone other than Central European (CET/CST)"); } } @@ -862,7 +862,7 @@ void tst_QDateTime::toLocalTime() QCOMPARE(utc.toLocalTime(), local); QCOMPARE(utc.toLocalTime(), local.toLocalTime()); } else { - QSKIP("Not tested with timezone other than Central European (CET/CST)", SkipAll); + QSKIP("Not tested with timezone other than Central European (CET/CST)"); } } @@ -884,7 +884,7 @@ void tst_QDateTime::toUTC() QCOMPARE(local.toUTC(), utc); QCOMPARE(utc.toUTC(), local.toUTC()); } else { - QSKIP("Not tested with timezone other than Central European (CET/CST)", SkipAll); + QSKIP("Not tested with timezone other than Central European (CET/CST)"); } // To make sure bug 72713 never happens again @@ -1093,7 +1093,7 @@ void tst_QDateTime::currentDateTimeUtc2() } while (--i && !ok); if (!i) - QSKIP("Failed to get the dates within 1 ms of each other", SkipAll); + QSKIP("Failed to get the dates within 1 ms of each other"); // seconds and milliseconds should be the same: QCOMPARE(utc.time().second(), local.time().second()); @@ -1162,7 +1162,7 @@ void tst_QDateTime::task_137698() // This is true for Central European Time if (!europeanTimeZone) - QSKIP("Not tested with timezone other than Central European (CET/CEST)", SkipAll); + QSKIP("Not tested with timezone other than Central European (CET/CEST)"); QDateTime dt = QDateTime(QDate(2006, 11, 6), QTime(0, 0, 0), Qt::LocalTime); dt.setDate(QDate(2006, 10, 16)); diff --git a/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp b/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp index cc7404deef..366ee25222 100644 --- a/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp +++ b/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp @@ -1074,9 +1074,8 @@ void tst_QLocale::toDateTime() void tst_QLocale::macDefaultLocale() { QLocale locale = QLocale::system(); - if (locale.name() != QLatin1String("en_US")) { - QSKIP("This test only tests for en_US", SkipAll); - } + if (locale.name() != QLatin1String("en_US")) + QSKIP("This test only tests for en_US"); QTime invalidTime; QDate invalidDate; diff --git a/tests/auto/corelib/tools/qsharedpointer/tst_qsharedpointer.cpp b/tests/auto/corelib/tools/qsharedpointer/tst_qsharedpointer.cpp index ff776b9752..7d7a81232c 100644 --- a/tests/auto/corelib/tools/qsharedpointer/tst_qsharedpointer.cpp +++ b/tests/auto/corelib/tools/qsharedpointer/tst_qsharedpointer.cpp @@ -819,7 +819,7 @@ void tst_QSharedPointer::differentPointers() if (*reinterpret_cast<quintptr *>(&aData) == *reinterpret_cast<quintptr *>(&aBase)) QFAIL("Something went very wrong -- we couldn't create two different pointers to the same object"); if (aData != aBase || aBase != aData) - QSKIP("Broken compiler", SkipAll); + QSKIP("Broken compiler"); QSharedPointer<DiffPtrDerivedData> ptr = QSharedPointer<DiffPtrDerivedData>(aData); QSharedPointer<Data> baseptr = qSharedPointerCast<Data>(ptr); @@ -1803,7 +1803,7 @@ void tst_QSharedPointer::invalidConstructs_data() void tst_QSharedPointer::invalidConstructs() { #ifdef Q_CC_MINGW - QSKIP("The maintainer of QSharedPointer: 'We don't know what the problem is so skip the tests.'", SkipAll); + QSKIP("The maintainer of QSharedPointer: 'We don't know what the problem is so skip the tests.'"); #endif QTest::QExternalTest test; diff --git a/tests/auto/corelib/tools/qstring/tst_qstring.cpp b/tests/auto/corelib/tools/qstring/tst_qstring.cpp index fc791ec74a..8ca9489390 100644 --- a/tests/auto/corelib/tools/qstring/tst_qstring.cpp +++ b/tests/auto/corelib/tools/qstring/tst_qstring.cpp @@ -4217,8 +4217,7 @@ void tst_QString::tortureSprintfDouble() s.sprintf(data->fmt, d); #ifdef QT_NO_FPU // reduced precision when running with hardfloats in qemu if (d - 0.1 < 1e12) - QSKIP("clib sprintf doesn't fill with 0's on this platform", - SkipSingle); + QSKIP("clib sprintf doesn't fill with 0's on this platform"); QCOMPARE(s.left(16), QString(data->expected).left(16)); #else QCOMPARE(s, QString(data->expected)); @@ -4360,8 +4359,7 @@ void tst_QString::localeAwareCompare() const char *newLocale = setlocale(LC_ALL, locale.toLatin1()); if (!newLocale) { setlocale(LC_ALL, ""); - QSKIP("Please install the proper locale on this machine to test properly", SkipSingle); - return; + QSKIP("Please install the proper locale on this machine to test properly"); } } #endif diff --git a/tests/auto/corelib/tools/qvarlengtharray/tst_qvarlengtharray.cpp b/tests/auto/corelib/tools/qvarlengtharray/tst_qvarlengtharray.cpp index fd67758cb6..73ff971945 100644 --- a/tests/auto/corelib/tools/qvarlengtharray/tst_qvarlengtharray.cpp +++ b/tests/auto/corelib/tools/qvarlengtharray/tst_qvarlengtharray.cpp @@ -205,7 +205,7 @@ void tst_QVarLengthArray::oldTests() QCOMPARE(sa3[5], 5); } - QSKIP("This test causes the machine to crash when allocating too much memory.", SkipSingle); + QSKIP("This test causes the machine to crash when allocating too much memory."); { QVarLengthArray<Foo> a; const int N = 0x7fffffff / sizeof(Foo); diff --git a/tests/auto/corelib/tools/qvector/tst_qvector.cpp b/tests/auto/corelib/tools/qvector/tst_qvector.cpp index 2b615bc28c..59ff332a1e 100644 --- a/tests/auto/corelib/tools/qvector/tst_qvector.cpp +++ b/tests/auto/corelib/tools/qvector/tst_qvector.cpp @@ -701,7 +701,7 @@ void tst_QVector::outOfMemory() { QVector<Foo> a; - QSKIP("This test crashes on many of our machines.", SkipSingle); + QSKIP("This test crashes on many of our machines."); a.resize(N); if (a.size() == N) { QVERIFY(a.capacity() >= N); |