diff options
132 files changed, 569 insertions, 654 deletions
diff --git a/src/3rdparty/harfbuzz/tests/shaping/main.cpp b/src/3rdparty/harfbuzz/tests/shaping/main.cpp index 73760a89f2..4d839c04d4 100644 --- a/src/3rdparty/harfbuzz/tests/shaping/main.cpp +++ b/src/3rdparty/harfbuzz/tests/shaping/main.cpp @@ -382,7 +382,7 @@ void tst_QScriptEngine::greek() } FT_Done_Face(face); } else { - QSKIP("couln't find DejaVu Sans", SkipAll); + QSKIP("couln't find DejaVu Sans"); } @@ -419,7 +419,7 @@ void tst_QScriptEngine::greek() FT_Done_Face(face); } else { - QSKIP("couln't find DejaVu Sans", SkipAll); + QSKIP("couln't find DejaVu Sans"); } } @@ -477,7 +477,7 @@ void tst_QScriptEngine::devanagari() FT_Done_Face(face); } else { - QSKIP("couln't find raghu.ttf", SkipAll); + QSKIP("couln't find raghu.ttf"); } } @@ -531,7 +531,7 @@ void tst_QScriptEngine::devanagari() FT_Done_Face(face); } else { - QSKIP("couldn't find mangal.ttf", SkipAll); + QSKIP("couldn't find mangal.ttf"); } } } @@ -658,7 +658,7 @@ void tst_QScriptEngine::bengali() FT_Done_Face(face); } else { - QSKIP("couln't find AkaashNormal.ttf", SkipAll); + QSKIP("couln't find AkaashNormal.ttf"); } } { @@ -772,7 +772,7 @@ void tst_QScriptEngine::bengali() FT_Done_Face(face); } else { - QSKIP("couln't find MuktiNarrow.ttf", SkipAll); + QSKIP("couln't find MuktiNarrow.ttf"); } } { @@ -808,7 +808,7 @@ void tst_QScriptEngine::bengali() FT_Done_Face(face); } else { - QSKIP("couln't find LikhanNormal.ttf", SkipAll); + QSKIP("couln't find LikhanNormal.ttf"); } } } @@ -833,7 +833,7 @@ void tst_QScriptEngine::gurmukhi() FT_Done_Face(face); } else { - QSKIP("couln't find lohit.punjabi.1.1.ttf", SkipAll); + QSKIP("couln't find lohit.punjabi.1.1.ttf"); } } } @@ -883,7 +883,7 @@ void tst_QScriptEngine::oriya() FT_Done_Face(face); } else { - QSKIP("couln't find utkalm.ttf", SkipAll); + QSKIP("couln't find utkalm.ttf"); } } } @@ -952,7 +952,7 @@ void tst_QScriptEngine::tamil() FT_Done_Face(face); } else { - QSKIP("couln't find akruti1.ttf", SkipAll); + QSKIP("couln't find akruti1.ttf"); } } } @@ -997,7 +997,7 @@ void tst_QScriptEngine::telugu() FT_Done_Face(face); } else { - QSKIP("couln't find Pothana2000.ttf", SkipAll); + QSKIP("couln't find Pothana2000.ttf"); } } } @@ -1046,7 +1046,7 @@ void tst_QScriptEngine::kannada() FT_Done_Face(face); } else { - QSKIP("couln't find Sampige.ttf", SkipAll); + QSKIP("couln't find Sampige.ttf"); } } { @@ -1081,7 +1081,7 @@ void tst_QScriptEngine::kannada() FT_Done_Face(face); } else { - QSKIP("couln't find tunga.ttf", SkipAll); + QSKIP("couln't find tunga.ttf"); } } } @@ -1143,7 +1143,7 @@ void tst_QScriptEngine::malayalam() FT_Done_Face(face); } else { - QSKIP("couln't find AkrutiMal2Normal.ttf", SkipAll); + QSKIP("couln't find AkrutiMal2Normal.ttf"); } } @@ -1174,7 +1174,7 @@ void tst_QScriptEngine::malayalam() FT_Done_Face(face); } else { - QSKIP("couln't find Rachana.ttf", SkipAll); + QSKIP("couln't find Rachana.ttf"); } } @@ -1209,7 +1209,7 @@ void tst_QScriptEngine::sinhala() FT_Done_Face(face); } else { - QSKIP("couln't find FM-MalithiUW46.ttf", SkipAll); + QSKIP("couln't find FM-MalithiUW46.ttf"); } } } @@ -1251,7 +1251,7 @@ void tst_QScriptEngine::khmer() FT_Done_Face(face); } else { - QSKIP("couln't find KhmerOS.ttf", SkipAll); + QSKIP("couln't find KhmerOS.ttf"); } } } @@ -1284,7 +1284,7 @@ void tst_QScriptEngine::nko() FT_Done_Face(face); } else { - QSKIP("couln't find DejaVuSans.ttf", SkipAll); + QSKIP("couln't find DejaVuSans.ttf"); } } } @@ -1310,7 +1310,7 @@ void tst_QScriptEngine::linearB() FT_Done_Face(face); } else { - QSKIP("couln't find PENUTURE.TTF", SkipAll); + QSKIP("couln't find PENUTURE.TTF"); } } } 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); diff --git a/tests/auto/dbus/qdbuslocalcalls/tst_qdbuslocalcalls.cpp b/tests/auto/dbus/qdbuslocalcalls/tst_qdbuslocalcalls.cpp index c89fd7dde4..56431b8716 100644 --- a/tests/auto/dbus/qdbuslocalcalls/tst_qdbuslocalcalls.cpp +++ b/tests/auto/dbus/qdbuslocalcalls/tst_qdbuslocalcalls.cpp @@ -257,7 +257,7 @@ void tst_QDBusLocalCalls::asyncReplySignal() callMsg << "Hello World"; QDBusPendingCall ac = conn.asyncCall(callMsg); if (ac.isFinished()) - QSKIP("Test ignored: the local-loop async call is already finished", SkipAll); + QSKIP("Test ignored: the local-loop async call is already finished"); QDBusPendingCallWatcher watch(ac); connect(&watch, SIGNAL(finished(QDBusPendingCallWatcher*)), diff --git a/tests/auto/dbus/qdbusmarshall/tst_qdbusmarshall.cpp b/tests/auto/dbus/qdbusmarshall/tst_qdbusmarshall.cpp index cca212e278..005dfda082 100644 --- a/tests/auto/dbus/qdbusmarshall/tst_qdbusmarshall.cpp +++ b/tests/auto/dbus/qdbusmarshall/tst_qdbusmarshall.cpp @@ -1060,7 +1060,7 @@ public: void tst_QDBusMarshall::receiveUnknownType() { #ifndef DBUS_TYPE_UNIX_FD - QSKIP("Your system's D-Bus library is too old for this test", SkipAll); + QSKIP("Your system's D-Bus library is too old for this test"); #else QDBusConnection con = QDBusConnection::sessionBus(); QVERIFY(con.isConnected()); @@ -1074,7 +1074,7 @@ void tst_QDBusMarshall::receiveUnknownType() // check if this bus supports passing file descriptors if (!dbus_connection_can_send_type(rawcon.data(), DBUS_TYPE_UNIX_FD)) - QSKIP("Your session bus does not allow sending Unix file descriptors", SkipAll); + QSKIP("Your session bus does not allow sending Unix file descriptors"); // make sure this QDBusConnection won't handle Unix file descriptors QDBusConnection::ConnectionCapabilities &capabRef = QDBusConnectionPrivate::d(con)->capabilities; diff --git a/tests/auto/gui/image/qicon/tst_qicon.cpp b/tests/auto/gui/image/qicon/tst_qicon.cpp index 35be4ae04f..5fac4739e2 100644 --- a/tests/auto/gui/image/qicon/tst_qicon.cpp +++ b/tests/auto/gui/image/qicon/tst_qicon.cpp @@ -209,7 +209,7 @@ void tst_QIcon::actualSize2() void tst_QIcon::svgActualSize() { if (!haveImageFormat("svg")) { - QSKIP("SVG support is not available", SkipAll); + QSKIP("SVG support is not available"); } const QString prefix = QLatin1String(SRCDIR) + QLatin1String("/"); @@ -423,7 +423,7 @@ void tst_QIcon::detach() void tst_QIcon::svg() { if (!haveImageFormat("svg")) { - QSKIP("SVG support is not available", SkipAll); + QSKIP("SVG support is not available"); } QIcon icon1("heart.svg"); diff --git a/tests/auto/gui/image/qimage/tst_qimage.cpp b/tests/auto/gui/image/qimage/tst_qimage.cpp index a144fdb3fc..e2da34dd6e 100644 --- a/tests/auto/gui/image/qimage/tst_qimage.cpp +++ b/tests/auto/gui/image/qimage/tst_qimage.cpp @@ -302,7 +302,7 @@ void tst_QImage::formatHandlersInput() QCOMPARE(testFormat.toLatin1().toLower(), QImageReader::imageFormat(testFile)); } else { QString msg = "Format not supported : "; - QSKIP(QString(msg + testFormat).toLatin1(), SkipSingle); + QSKIP(QString(msg + testFormat).toLatin1()); } } diff --git a/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp b/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp index d36a7bba39..4f9ec0dfb1 100644 --- a/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp +++ b/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp @@ -187,7 +187,7 @@ static const QLatin1String prefix(SRCDIR "/images/"); // helper to skip an autotest when the given image format is not supported #define SKIP_IF_UNSUPPORTED(format) do { \ if (!QByteArray(format).isEmpty() && !QImageReader::supportedImageFormats().contains(format)) \ - QSKIP("\"" + QByteArray(format) + "\" images are not supported", SkipSingle); \ + QSKIP("\"" + QByteArray(format) + "\" images are not supported"); \ } while (0) // Testing get/set functions diff --git a/tests/auto/gui/image/qpixmap/tst_qpixmap.cpp b/tests/auto/gui/image/qpixmap/tst_qpixmap.cpp index 996bd6c017..5ff764378a 100644 --- a/tests/auto/gui/image/qpixmap/tst_qpixmap.cpp +++ b/tests/auto/gui/image/qpixmap/tst_qpixmap.cpp @@ -277,7 +277,7 @@ void tst_QPixmap::fromImage() const QPixmap pixmap = QPixmap::fromImage(image); #ifdef Q_WS_X11 if (pixmap.handle()->classId() == QPlatformPixmap::X11Class && !pixmap.x11PictureHandle()) - QSKIP("Requires XRender support", SkipAll); + QSKIP("Requires XRender support"); #endif const QImage result = pixmap.toImage(); image = image.convertToFormat(result.format()); @@ -505,12 +505,12 @@ void tst_QPixmap::fill() #if defined(Q_WS_X11) if (!bitmap && pm.handle()->classId() == QPlatformPixmap::X11Class && !pm.x11PictureHandle()) - QSKIP("Requires XRender support", SkipSingle); + QSKIP("Requires XRender support"); #endif pm.fill(color); if (syscolor && !bitmap && pm.depth() < 24) { - QSKIP("Test does not work on displays without true color", SkipSingle); + QSKIP("Test does not work on displays without true color"); } QImage image = pm.toImage(); @@ -535,7 +535,7 @@ void tst_QPixmap::fill_transparent() QPixmap pixmap(10, 10); #ifdef Q_WS_X11 if (pixmap.handle()->classId() == QPlatformPixmap::X11Class && !pixmap.x11PictureHandle()) - QSKIP("Requires XRender support", SkipAll); + QSKIP("Requires XRender support"); #endif pixmap.fill(Qt::transparent); QVERIFY(pixmap.hasAlphaChannel()); @@ -775,7 +775,7 @@ void tst_QPixmap::grabWidget() void tst_QPixmap::grabWindow() { #ifdef Q_WS_QPA - QSKIP("QTBUG-20863 grabWindow is broken on most qpa backends", SkipAll); + QSKIP("QTBUG-20863 grabWindow is broken on most qpa backends"); #endif #ifdef Q_OS_WINCE // We get out of memory, if the desktop itself is too big. @@ -839,7 +839,7 @@ void tst_QPixmap::convertFromImageNoDetach() { QPixmap randomPixmap(10, 10); if (randomPixmap.handle()->classId() != QPlatformPixmap::RasterClass) - QSKIP("Test only valid for raster pixmaps", SkipAll); + QSKIP("Test only valid for raster pixmaps"); //first get the screen format QImage::Format screenFormat = randomPixmap.toImage().format(); @@ -1013,7 +1013,7 @@ void tst_QPixmap::toWinHICON_data() void tst_QPixmap::toWinHICON() { #ifdef Q_OS_WINCE - QSKIP("Test shall be enabled for Windows CE shortly.", SkipAll); + QSKIP("Test shall be enabled for Windows CE shortly."); #endif QFETCH(int, width); @@ -1057,7 +1057,7 @@ void tst_QPixmap::fromWinHICON_data() void tst_QPixmap::fromWinHICON() { #ifdef Q_OS_WINCE - QSKIP("Test shall be enabled for Windows CE shortly.", SkipAll); + QSKIP("Test shall be enabled for Windows CE shortly."); #else QFETCH(int, width); @@ -1084,7 +1084,7 @@ void tst_QPixmap::fromWinHICON() void tst_QPixmap::onlyNullPixmapsOutsideGuiThread() { #ifdef Q_WS_QPA - QSKIP("QTBUG-20864 can't determine if threaded pixmaps are available for qpa", SkipAll); + QSKIP("QTBUG-20864 can't determine if threaded pixmaps are available for qpa"); #endif #if !defined(Q_WS_WIN) && !defined(Q_WS_MAC) class Thread : public QThread diff --git a/tests/auto/gui/kernel/qclipboard/tst_qclipboard.cpp b/tests/auto/gui/kernel/qclipboard/tst_qclipboard.cpp index 88506e66a6..bdcfb00ba1 100644 --- a/tests/auto/gui/kernel/qclipboard/tst_qclipboard.cpp +++ b/tests/auto/gui/kernel/qclipboard/tst_qclipboard.cpp @@ -107,7 +107,7 @@ void tst_QClipboard::modes() QClipboard * const clipboard = QApplication::clipboard(); if (!nativeClipboardWorking()) - QSKIP("Native clipboard not working in this setup", SkipAll); + QSKIP("Native clipboard not working in this setup"); const QString defaultMode = "default mode text;"; clipboard->setText(defaultMode); @@ -137,7 +137,7 @@ void tst_QClipboard::testSignals() qRegisterMetaType<QClipboard::Mode>("QClipboard::Mode"); if (!nativeClipboardWorking()) - QSKIP("Native clipboard not working in this setup", SkipAll); + QSKIP("Native clipboard not working in this setup"); QClipboard * const clipboard = QApplication::clipboard(); @@ -195,7 +195,7 @@ void tst_QClipboard::testSignals() void tst_QClipboard::copy_exit_paste() { if (!nativeClipboardWorking()) - QSKIP("Native clipboard not working in this setup", SkipAll); + QSKIP("Native clipboard not working in this setup"); const QStringList stringArgument = QStringList() << "Test string."; QCOMPARE(QProcess::execute("copier/copier", stringArgument), 0); #ifdef Q_WS_MAC @@ -209,7 +209,7 @@ void tst_QClipboard::copy_exit_paste() void tst_QClipboard::setMimeData() { if (!nativeClipboardWorking()) - QSKIP("Native clipboard not working in this setup", SkipAll); + QSKIP("Native clipboard not working in this setup"); QMimeData *mimeData = new QMimeData; const QString TestName(QLatin1String("tst_QClipboard::setMimeData() mimeData")); mimeData->setObjectName(TestName); @@ -299,7 +299,7 @@ void tst_QClipboard::clearBeforeSetText() QApplication::processEvents(); if (!nativeClipboardWorking()) - QSKIP("Native clipboard not working in this setup", SkipAll); + QSKIP("Native clipboard not working in this setup"); const QString text = "tst_QClipboard::clearBeforeSetText()"; diff --git a/tests/auto/gui/painting/qpainter/tst_qpainter.cpp b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp index 70674aa29a..e8e3f998e0 100644 --- a/tests/auto/gui/painting/qpainter/tst_qpainter.cpp +++ b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp @@ -379,7 +379,7 @@ void tst_QPainter::cleanup() void tst_QPainter::qt_format_text_clip() { QVERIFY(1); - QSKIP( "Needs fixing...", SkipAll); + QSKIP("Needs fixing..."); QWidget *w = new QWidget( 0 ); @@ -513,7 +513,7 @@ void tst_QPainter::qt_format_text_clip() void tst_QPainter::qt_format_text_boundingRect() { QVERIFY(1); - QSKIP( "Needs fixing...", SkipAll); + QSKIP("Needs fixing..."); { const char * strings[] = { @@ -568,11 +568,8 @@ void tst_QPainter::qt_format_text_boundingRect() #if !defined(QT_NO_PRINTER) && !defined(Q_OS_WINCE) { QPrinter printer(QPrinter::HighResolution); - if (printer.printerName().isEmpty()) { - QSKIP( "No printers installed, skipping bounding rect test", - SkipSingle ); - break; - } + if (printer.printerName().isEmpty()) + QSKIP("No printers installed, skipping bounding rect test"); printer.setOutputFileName("tmp.prn"); QPainter p(&printer); @@ -694,10 +691,8 @@ static const char* const maskResult_data[] = { #ifndef Q_WS_MAC void tst_QPainter::drawPixmap_comp_data() { - if (qApp->desktop()->depth() < 24) { - QSKIP("Test only works on 32 bit displays", SkipAll); - return; - } + if (qApp->desktop()->depth() < 24) + QSKIP("Test only works on 32 bit displays"); QTest::addColumn<uint>("dest"); QTest::addColumn<uint>("source"); @@ -752,7 +747,7 @@ void tst_QPainter::drawPixmap_comp() #if defined(Q_WS_X11) if (!destPm.x11PictureHandle()) - QSKIP("Requires XRender support", SkipAll); + QSKIP("Requires XRender support"); #endif QPainter p(&destPm); @@ -1621,7 +1616,7 @@ void tst_QPainter::drawClippedEllipse() { QFETCH(QRect, rect); if (sizeof(qreal) != sizeof(double)) - QSKIP("Test only works for qreal==double", SkipAll); + QSKIP("Test only works for qreal==double"); QImage image(rect.width() + 1, rect.height() + 1, QImage::Format_ARGB32_Premultiplied); QRect expected = QRect(rect.x(), rect.y(), rect.width()+1, rect.height()+1) @@ -1657,7 +1652,7 @@ void tst_QPainter::drawRoundRect() QTest::currentDataTag() == QByteArray("rect(13, 50, 17, 91) with pen") || QTest::currentDataTag() == QByteArray("rect(17, 6, 24, 3) with pen") || QTest::currentDataTag() == QByteArray("rect(24, 12, 38, 14) with pen")) - QSKIP("The Mac paint engine is off-by-one on certain rect sizes", SkipSingle); + QSKIP("The Mac paint engine is off-by-one on certain rect sizes"); #endif QPixmap pixmap(rect.x() + rect.width() + 10, rect.y() + rect.height() + 10); @@ -3127,7 +3122,7 @@ void tst_QPainter::x() \ #define FPE_TEST(x) \ void tst_QPainter::x() \ { \ - QSKIP("Floating point exception checking (fenv.h) not available", SkipAll); \ + QSKIP("Floating point exception checking (fenv.h) not available"); \ } #endif @@ -3434,8 +3429,7 @@ bool verifyOutlineFillConsistency(const QImage &img, QRgb outside, QRgb inside, void tst_QPainter::outlineFillConsistency() { - QSKIP("currently broken...", SkipAll); - return; + QSKIP("currently broken..."); QImage dst(256, 256, QImage::Format_ARGB32_Premultiplied); @@ -4674,7 +4668,7 @@ void TextDrawerThread::run() void tst_QPainter::drawTextOutsideGuiThread() { if (!QFontDatabase::supportsThreadedFontRendering()) - QSKIP("No threaded font rendering", SkipAll); + QSKIP("No threaded font rendering"); QImage referenceRendering(100, 100, QImage::Format_ARGB32_Premultiplied); referenceRendering.fill(0); diff --git a/tests/auto/gui/painting/qpathclipper/tst_qpathclipper.cpp b/tests/auto/gui/painting/qpathclipper/tst_qpathclipper.cpp index 5a7c803eea..6acaf5e5c3 100644 --- a/tests/auto/gui/painting/qpathclipper/tst_qpathclipper.cpp +++ b/tests/auto/gui/painting/qpathclipper/tst_qpathclipper.cpp @@ -421,7 +421,7 @@ void tst_QPathClipper::testComparePaths() void tst_QPathClipper::clip() { if (sizeof(double) != sizeof(qreal)) { - QSKIP("This test only works for qreal=double, otherwise ends in rounding errors", SkipAll); + QSKIP("This test only works for qreal=double, otherwise ends in rounding errors"); } QFETCH( QPainterPath, subject ); QFETCH( QPainterPath, clip ); @@ -542,7 +542,7 @@ void tst_QPathClipper::clipTest(int subjectIndex, int clipIndex, QPathClipper::O void tst_QPathClipper::clip2() { if (sizeof(double) != sizeof(qreal)) - QSKIP("This test only works for qreal=double, otherwise ends in rounding errors", SkipAll); + QSKIP("This test only works for qreal=double, otherwise ends in rounding errors"); int operation = 0; @@ -1301,7 +1301,7 @@ void tst_QPathClipper::task251909() void tst_QPathClipper::qtbug3778() { if (sizeof(double) != sizeof(qreal)) { - QSKIP("This test only works for qreal=double, otherwise ends in rounding errors", SkipAll); + QSKIP("This test only works for qreal=double, otherwise ends in rounding errors"); } QPainterPath path1; path1.moveTo(200, 3.22409e-5); diff --git a/tests/auto/gui/painting/qprinter/tst_qprinter.cpp b/tests/auto/gui/painting/qprinter/tst_qprinter.cpp index 508d0ea628..43524649ae 100644 --- a/tests/auto/gui/painting/qprinter/tst_qprinter.cpp +++ b/tests/auto/gui/painting/qprinter/tst_qprinter.cpp @@ -111,7 +111,7 @@ private slots: #ifdef QT_NO_PRINTER void tst_QPrinter::initTestCase() { - QSKIP("This test requires printing support", SkipAll); + QSKIP("This test requires printing support"); } #else @@ -469,7 +469,7 @@ void tst_QPrinter::testMulitpleSets() printer.setPageSize(printerPageSize); if (printer.pageSize() != printerPageSize) { - QSKIP("Current page size is not supported on this printer", SkipSingle); + QSKIP("Current page size is not supported on this printer"); return; } @@ -506,7 +506,7 @@ void tst_QPrinter::changingOutputFormat() void tst_QPrinter::outputFormatFromSuffix() { if (QPrinterInfo::availablePrinters().size() == 0) - QSKIP("No printers available.", SkipAll); + QSKIP("No printers available."); QPrinter p; QVERIFY(p.outputFormat() == QPrinter::NativeFormat); p.setOutputFileName("test.pdf"); diff --git a/tests/auto/gui/painting/qprinterinfo/tst_qprinterinfo.cpp b/tests/auto/gui/painting/qprinterinfo/tst_qprinterinfo.cpp index 297664978e..e039347801 100644 --- a/tests/auto/gui/painting/qprinterinfo/tst_qprinterinfo.cpp +++ b/tests/auto/gui/painting/qprinterinfo/tst_qprinterinfo.cpp @@ -86,7 +86,7 @@ private: #ifdef QT_NO_PRINTER void tst_QPrinterInfo::initTestCase() { - QSKIP("This test requires printing support", SkipAll); + QSKIP("This test requires printing support"); } #else @@ -215,7 +215,7 @@ void tst_QPrinterInfo::testForDefaultPrinter() if (QHostInfo::localHostName() == "fantomet" || QHostInfo::localHostName() == "bobo") { QWARN("Test is hardcoded to \"fantomet\" and \"bobo\" on Windows and may fail"); } else { - QSKIP("Test is hardcoded to \"fantomet\" and \"bobo\" on Windows", SkipAll); + QSKIP("Test is hardcoded to \"fantomet\" and \"bobo\" on Windows"); } QString defSysPrinter; if (QHostInfo::localHostName() == "fantomet") { @@ -252,7 +252,7 @@ void tst_QPrinterInfo::testForPrinters() if (QHostInfo::localHostName() == "fantomet" || QHostInfo::localHostName() == "bobo") { QWARN("Test is hardcoded to \"fantomet\" and \"bobo\" on Windows and may fail"); } else { - QSKIP("Test is hardcoded to \"fantomet\" and \"bobo\" on Windows", SkipAll); + QSKIP("Test is hardcoded to \"fantomet\" and \"bobo\" on Windows"); } QStringList sysPrinters; if (QHostInfo::localHostName() == "fantomet") { @@ -296,7 +296,7 @@ void tst_QPrinterInfo::testForPrinters() void tst_QPrinterInfo::testForPaperSizes() { -QSKIP("PaperSize feature doesn't work on Windows, fails on Mac, and is unstable on Linux", SkipAll); +QSKIP("PaperSize feature doesn't work on Windows, fails on Mac, and is unstable on Linux"); // This test is based on common printers found at the Oslo // office. It is likely to be skipped or fail for other locations. QStringList hardPrinters; diff --git a/tests/auto/gui/painting/qtransform/tst_qtransform.cpp b/tests/auto/gui/painting/qtransform/tst_qtransform.cpp index f8319c9e13..741b7f1680 100644 --- a/tests/auto/gui/painting/qtransform/tst_qtransform.cpp +++ b/tests/auto/gui/painting/qtransform/tst_qtransform.cpp @@ -749,7 +749,7 @@ void tst_QTransform::inverted_data() void tst_QTransform::inverted() { if (sizeof(qreal) != sizeof(double)) - QSKIP("precision error if qreal is not double", SkipAll); + QSKIP("precision error if qreal is not double"); QFETCH(QTransform, matrix); diff --git a/tests/auto/gui/painting/qwmatrix/tst_qwmatrix.cpp b/tests/auto/gui/painting/qwmatrix/tst_qwmatrix.cpp index 06abc5a68c..32084df61f 100644 --- a/tests/auto/gui/painting/qwmatrix/tst_qwmatrix.cpp +++ b/tests/auto/gui/painting/qwmatrix/tst_qwmatrix.cpp @@ -316,8 +316,7 @@ void tst_QWMatrix::operator_star_qwmatrix() QVERIFY( product12==result1x2 ); QVERIFY( product21==result2x1 ); #else - QSKIP( "Not tested with Qt versions since the operator is broken..", - SkipAll ); + QSKIP( "Not tested with Qt versions since the operator is broken.." ); #endif } diff --git a/tests/auto/gui/text/qcssparser/tst_qcssparser.cpp b/tests/auto/gui/text/qcssparser/tst_qcssparser.cpp index 4e8085811d..822b5275da 100644 --- a/tests/auto/gui/text/qcssparser/tst_qcssparser.cpp +++ b/tests/auto/gui/text/qcssparser/tst_qcssparser.cpp @@ -1551,7 +1551,7 @@ void tst_QCssParser::gradient() void tst_QCssParser::extractFontFamily_data() { if (QFontInfo(QFont("Times New Roman")).family() != "Times New Roman") - QSKIP("'Times New Roman' font not found ", SkipAll); + QSKIP("'Times New Roman' font not found"); QTest::addColumn<QString>("css"); QTest::addColumn<QString>("expectedFamily"); @@ -1597,7 +1597,7 @@ void tst_QCssParser::extractFontFamily() // Note, we have to QSKIP rather than QEXPECT_FAIL because font lookup is broken // such that it may work or not work depending on the order in which fonts were // loaded from disk - QSKIP("QTBUG-20986 may fail on qpa", SkipSingle); + QSKIP("QTBUG-20986 may fail on qpa"); #endif QTEST(info.family(), "expectedFamily"); diff --git a/tests/auto/gui/text/qfont/tst_qfont.cpp b/tests/auto/gui/text/qfont/tst_qfont.cpp index d21c673b6d..3566342f00 100644 --- a/tests/auto/gui/text/qfont/tst_qfont.cpp +++ b/tests/auto/gui/text/qfont/tst_qfont.cpp @@ -167,8 +167,7 @@ void tst_QFont::exactMatch() QVERIFY(QFont("monospace").exactMatch()); #endif - QSKIP("This test is bogus on Unix with support for font aliases in fontconfig", SkipAll); - return; + QSKIP("This test is bogus on Unix with support for font aliases in fontconfig"); QFontDatabase fdb; @@ -538,9 +537,8 @@ void tst_QFont::setFontRaw() if (str.toLower() == "fixed") found = true; } - if (!found) { - QSKIP("Fixed font not available.", SkipSingle); - } + if (!found) + QSKIP("Fixed font not available."); QCOMPARE(QFontInfo(f).family().left(5).toLower(), QString("fixed")); } #endif @@ -654,7 +652,7 @@ void tst_QFont::defaultFamily() QFontDatabase db; if (!db.hasFamily(defaultFamily)) - QSKIP("Font family is not available on the system", SkipSingle); + QSKIP("Font family is not available on the system"); QFont f; f.setStyleHint(styleHint); diff --git a/tests/auto/gui/text/qfontdatabase/tst_qfontdatabase.cpp b/tests/auto/gui/text/qfontdatabase/tst_qfontdatabase.cpp index af6d822666..c3b942f331 100644 --- a/tests/auto/gui/text/qfontdatabase/tst_qfontdatabase.cpp +++ b/tests/auto/gui/text/qfontdatabase/tst_qfontdatabase.cpp @@ -157,7 +157,7 @@ void tst_QFontDatabase::fixedPitch() QFontDatabase fdb; if (!fdb.families().contains(font)) - QSKIP( "Font not installed", SkipSingle); + QSKIP( "Font not installed"); QCOMPARE(fdb.isFixedPitch(font), fixedPitch); @@ -181,7 +181,7 @@ void tst_QFontDatabase::trickyFonts() QFontDatabase fdb; if (!fdb.families().contains(font)) - QSKIP( "Font not installed", SkipSingle); + QSKIP( "Font not installed"); QFont qfont(font); QFontInfo fi(qfont); @@ -254,7 +254,7 @@ void tst_QFontDatabase::addAppFont() // addApplicationFont is supported on Mac, don't skip the test if it breaks. #ifndef Q_WS_MAC if (id == -1) - QSKIP("Skip the test since app fonts are not supported on this system", SkipSingle); + QSKIP("Skip the test since app fonts are not supported on this system"); #endif const QStringList addedFamilies = QFontDatabase::applicationFontFamilies(id); diff --git a/tests/auto/gui/text/qglyphrun/tst_qglyphrun.cpp b/tests/auto/gui/text/qglyphrun/tst_qglyphrun.cpp index 4db01c91a2..256ea20a1c 100644 --- a/tests/auto/gui/text/qglyphrun/tst_qglyphrun.cpp +++ b/tests/auto/gui/text/qglyphrun/tst_qglyphrun.cpp @@ -104,9 +104,8 @@ void tst_QGlyphRun::initTestCase() void tst_QGlyphRun::init() { - if (!m_testFont_ok) { - QSKIP("Test font is not working correctly", SkipAll); - } + if (!m_testFont_ok) + QSKIP("Test font is not working correctly"); } void tst_QGlyphRun::cleanupTestCase() diff --git a/tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp b/tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp index e8889f55c6..17955b36f2 100644 --- a/tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp +++ b/tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp @@ -1472,7 +1472,7 @@ void tst_QTextLayout::textWidthWithLineSeparator() void tst_QTextLayout::cursorInLigatureWithMultipleLines() { #if !defined(Q_WS_MAC) - QSKIP("This test can not be run on Mac", SkipAll); + QSKIP("This test can not be run on Mac"); #endif QTextLayout layout("first line finish", QFont("Times", 20)); layout.beginLayout(); @@ -1488,7 +1488,7 @@ void tst_QTextLayout::cursorInLigatureWithMultipleLines() void tst_QTextLayout::xToCursorForLigatures() { #if !defined(Q_WS_MAC) - QSKIP("This test can not be run on Mac", SkipAll); + QSKIP("This test can not be run on Mac"); #endif QTextLayout layout("fi", QFont("Times", 20)); layout.beginLayout(); diff --git a/tests/auto/gui/text/qtextscriptengine/tst_qtextscriptengine.cpp b/tests/auto/gui/text/qtextscriptengine/tst_qtextscriptengine.cpp index 4f9beb6f19..0149a0a0a0 100644 --- a/tests/auto/gui/text/qtextscriptengine/tst_qtextscriptengine.cpp +++ b/tests/auto/gui/text/qtextscriptengine/tst_qtextscriptengine.cpp @@ -207,9 +207,8 @@ static bool shaping( const QFont &f, const ShapeTable *s) #ifdef Q_WS_X11 void tst_QTextScriptEngine::devanagari() { - if (!haveTestFonts) { - QSKIP("Test fonts are not available", SkipAll); - } + if (!haveTestFonts) + QSKIP("Test fonts are not available"); { if (QFontDatabase().families(QFontDatabase::Devanagari).contains("Raghindi")) { @@ -259,9 +258,8 @@ void tst_QTextScriptEngine::devanagari() QVERIFY( shaping(f, s) ); ++s; } - } else { - QSKIP("couldn't find Raghindi", SkipAll); - } + } else + QSKIP("couldn't find Raghindi"); } { @@ -311,9 +309,8 @@ void tst_QTextScriptEngine::devanagari() QVERIFY( shaping(f, s) ); ++s; } - } else { - QSKIP("couldn't find mangal", SkipAll); - } + } else + QSKIP("couldn't find mangal"); } } #endif @@ -321,9 +318,8 @@ void tst_QTextScriptEngine::devanagari() #ifdef Q_WS_X11 void tst_QTextScriptEngine::bengali() { - if (!haveTestFonts) { - QSKIP("Test fonts are not available", SkipAll); - } + if (!haveTestFonts) + QSKIP("Test fonts are not available"); { if (QFontDatabase().families(QFontDatabase::Bengali).contains("Akaash")) { @@ -431,9 +427,8 @@ void tst_QTextScriptEngine::bengali() QVERIFY( shaping(f, s) ); ++s; } - } else { - QSKIP("couldn't find Akaash", SkipAll); - } + } else + QSKIP("couldn't find Akaash"); } { if (QFontDatabase().families(QFontDatabase::Bengali).contains("Mukti Narrow")) { @@ -536,9 +531,8 @@ void tst_QTextScriptEngine::bengali() QVERIFY( shaping(f, s) ); ++s; } - } else { - QSKIP("couldn't find Mukti", SkipAll); - } + } else + QSKIP("couldn't find Mukti"); } { if (QFontDatabase().families(QFontDatabase::Bengali).contains("Likhan")) { @@ -564,9 +558,8 @@ void tst_QTextScriptEngine::bengali() QVERIFY( shaping(f, s) ); ++s; } - } else { - QSKIP("couldn't find Likhan", SkipAll); - } + } else + QSKIP("couldn't find Likhan"); } } #endif @@ -574,9 +567,8 @@ void tst_QTextScriptEngine::bengali() #ifdef Q_WS_X11 void tst_QTextScriptEngine::gurmukhi() { - if (!haveTestFonts) { - QSKIP("Test fonts are not available", SkipAll); - } + if (!haveTestFonts) + QSKIP("Test fonts are not available"); { if (QFontDatabase().families(QFontDatabase::Gurmukhi).contains("Lohit Punjabi")) { @@ -593,9 +585,8 @@ void tst_QTextScriptEngine::gurmukhi() QVERIFY( shaping(f, s) ); ++s; } - } else { - QSKIP("couldn't find Lohit Punjabi", SkipAll); - } + } else + QSKIP("couldn't find Lohit Punjabi"); } } #endif @@ -603,9 +594,8 @@ void tst_QTextScriptEngine::gurmukhi() #ifdef Q_WS_X11 void tst_QTextScriptEngine::oriya() { - if (!haveTestFonts) { - QSKIP("Test fonts are not available", SkipAll); - } + if (!haveTestFonts) + QSKIP("Test fonts are not available"); { if (QFontDatabase().families(QFontDatabase::Oriya).contains("utkal")) { @@ -634,19 +624,17 @@ void tst_QTextScriptEngine::oriya() QVERIFY( shaping(f, s) ); ++s; } - } else { - QSKIP("couldn't find utkal", SkipAll); - } - } + } else + QSKIP("couldn't find utkal"); + } } #endif #ifdef Q_WS_X11 void tst_QTextScriptEngine::tamil() { - if (!haveTestFonts) { - QSKIP("Test fonts are not available", SkipAll); - } + if (!haveTestFonts) + QSKIP("Test fonts are not available"); { if (QFontDatabase().families(QFontDatabase::Tamil).contains("AkrutiTml1")) { @@ -712,9 +700,8 @@ void tst_QTextScriptEngine::tamil() QVERIFY( shaping(f, s) ); ++s; } - } else { - QSKIP("couldn't find AkrutiTml1", SkipAll); - } + } else + QSKIP("couldn't find AkrutiTml1"); } } #endif @@ -722,9 +709,8 @@ void tst_QTextScriptEngine::tamil() #ifdef Q_WS_X11 void tst_QTextScriptEngine::telugu() { - if (!haveTestFonts) { - QSKIP("Test fonts are not available", SkipAll); - } + if (!haveTestFonts) + QSKIP("Test fonts are not available"); { if (QFontDatabase().families(QFontDatabase::Telugu).contains("Pothana2000")) { @@ -761,9 +747,8 @@ void tst_QTextScriptEngine::telugu() QVERIFY( shaping(f, s) ); ++s; } - } else { - QSKIP("couldn't find Pothana2000", SkipAll); - } + } else + QSKIP("couldn't find Pothana2000"); } } #endif @@ -805,9 +790,8 @@ void tst_QTextScriptEngine::kannada() QVERIFY( shaping(f, s) ); ++s; } - } else { - QSKIP("couldn't find Sampige", SkipAll); - } + } else + QSKIP("couldn't find Sampige"); } { if (QFontDatabase().families(QFontDatabase::Kannada).contains("Tunga")) { @@ -836,9 +820,8 @@ void tst_QTextScriptEngine::kannada() QVERIFY( shaping(f, s) ); ++s; } - } else { - QSKIP("couldn't find Tunga", SkipAll); - } + } else + QSKIP("couldn't find Tunga"); } } #endif @@ -846,9 +829,8 @@ void tst_QTextScriptEngine::kannada() #ifdef Q_WS_X11 void tst_QTextScriptEngine::malayalam() { - if (!haveTestFonts) { - QSKIP("Test fonts are not available", SkipAll); - } + if (!haveTestFonts) + QSKIP("Test fonts are not available"); { if (QFontDatabase().families(QFontDatabase::Malayalam).contains("AkrutiMal2")) { @@ -897,9 +879,8 @@ void tst_QTextScriptEngine::malayalam() QVERIFY( shaping(f, s) ); ++s; } - } else { - QSKIP("couldn't find AkrutiMal2", SkipAll); - } + } else + QSKIP("couldn't find AkrutiMal2"); } { if (QFontDatabase().families(QFontDatabase::Malayalam).contains("Rachana")) { @@ -925,9 +906,8 @@ void tst_QTextScriptEngine::malayalam() QVERIFY( shaping(f, s) ); ++s; } - } else { - QSKIP("couldn't find Rachana", SkipAll); - } + } else + QSKIP("couldn't find Rachana"); } } #endif @@ -935,9 +915,8 @@ void tst_QTextScriptEngine::malayalam() #ifdef Q_WS_X11 void tst_QTextScriptEngine::sinhala() { - if (!haveTestFonts) { - QSKIP("Test fonts are not available", SkipAll); - } + if (!haveTestFonts) + QSKIP("Test fonts are not available"); { if (QFontDatabase().families(QFontDatabase::Sinhala).contains("Malithi Web")) { @@ -964,9 +943,8 @@ void tst_QTextScriptEngine::sinhala() QVERIFY( shaping(f, s) ); ++s; } - } else { - QSKIP("couldn't find Malithi Web", SkipAll); - } + } else + QSKIP("couldn't find Malithi Web"); } } #endif @@ -974,9 +952,8 @@ void tst_QTextScriptEngine::sinhala() #ifdef Q_WS_X11 void tst_QTextScriptEngine::khmer() { - if (!haveTestFonts) { - QSKIP("Test fonts are not available", SkipAll); - } + if (!haveTestFonts) + QSKIP("Test fonts are not available"); { if (QFontDatabase().families(QFontDatabase::Khmer).contains("Khmer OS")) { @@ -1009,9 +986,8 @@ void tst_QTextScriptEngine::khmer() QVERIFY( shaping(f, s) ); ++s; } - } else { - QSKIP("couldn't find Khmer OS", SkipAll); - } + } else + QSKIP("couldn't find Khmer OS"); } } #endif @@ -1019,9 +995,8 @@ void tst_QTextScriptEngine::khmer() #ifdef Q_WS_X11 void tst_QTextScriptEngine::linearB() { - if (!haveTestFonts) { - QSKIP("Test fonts are not available", SkipAll); - } + if (!haveTestFonts) + QSKIP("Test fonts are not available"); { if (QFontDatabase().families(QFontDatabase::Any).contains("Penuturesu")) { @@ -1038,9 +1013,8 @@ void tst_QTextScriptEngine::linearB() QVERIFY( shaping(f, s) ); ++s; } - } else { - QSKIP("couldn't find Penuturesu", SkipAll); - } + } else + QSKIP("couldn't find Penuturesu"); } } #endif @@ -1095,9 +1069,8 @@ static bool decomposedShaping( const QFont &f, const QChar &ch) #ifdef Q_WS_X11 void tst_QTextScriptEngine::greek() { - if (!haveTestFonts) { - QSKIP("Test fonts are not available", SkipAll); - } + if (!haveTestFonts) + QSKIP("Test fonts are not available"); { if (QFontDatabase().families(QFontDatabase::Any).contains("DejaVu Sans")) { @@ -1113,9 +1086,8 @@ void tst_QTextScriptEngine::greek() continue; QVERIFY( decomposedShaping(f, QChar(uc)) ); } - } else { - QSKIP("couldn't find DejaVu Sans", SkipAll); - } + } else + QSKIP("couldn't find DejaVu Sans"); } { @@ -1149,9 +1121,8 @@ void tst_QTextScriptEngine::greek() QVERIFY( shaping(f, s) ); ++s; } - } else { - QSKIP("couldn't find SBL_grk", SkipAll); - } + } else + QSKIP("couldn't find SBL_grk"); } } #endif @@ -1196,10 +1167,8 @@ void tst_QTextScriptEngine::combiningMarks_qtbug15675() #elif defined(Q_WS_X11) QFontDatabase db; - if (!db.families().contains("DejaVu Sans Mono")) { - QSKIP("Required font (DejaVu Sans Mono) doesn't exist, skip test.", SkipAll); - return; - } + if (!db.families().contains("DejaVu Sans Mono")) + QSKIP("Required font (DejaVu Sans Mono) doesn't exist, skip test."); QString s; s.append(QChar(0x0062)); diff --git a/tests/auto/integrationtests/exceptionsafety/tst_exceptionsafety.cpp b/tests/auto/integrationtests/exceptionsafety/tst_exceptionsafety.cpp index 27db9ea7f7..ba384e0290 100644 --- a/tests/auto/integrationtests/exceptionsafety/tst_exceptionsafety.cpp +++ b/tests/auto/integrationtests/exceptionsafety/tst_exceptionsafety.cpp @@ -65,7 +65,7 @@ private slots: #ifdef QT_NO_EXCEPTIONS void tst_ExceptionSafety::initTestCase() { - QSKIP("This test requires exception support", SkipAll); + QSKIP("This test requires exception support"); } #else diff --git a/tests/auto/integrationtests/exceptionsafety_objects/tst_exceptionsafety_objects.cpp b/tests/auto/integrationtests/exceptionsafety_objects/tst_exceptionsafety_objects.cpp index 0d410a79a2..21b359339d 100644 --- a/tests/auto/integrationtests/exceptionsafety_objects/tst_exceptionsafety_objects.cpp +++ b/tests/auto/integrationtests/exceptionsafety_objects/tst_exceptionsafety_objects.cpp @@ -87,7 +87,7 @@ private: #ifdef QT_NO_EXCEPTIONS void tst_ExceptionSafety_Objects::initTestCase() { - QSKIP("This test requires exception support", SkipAll); + QSKIP("This test requires exception support"); } #else @@ -353,7 +353,7 @@ void tst_ExceptionSafety_Objects::objects() || tag == QLatin1String("QSettings") || tag == QLatin1String("QThread") || tag == QLatin1String("QThreadPool")) - QSKIP("This type of object is not currently strongly exception safe", SkipSingle); + QSKIP("This type of object is not currently strongly exception safe"); QFETCH(AbstractTester *, objectCreator); @@ -488,7 +488,7 @@ void tst_ExceptionSafety_Objects::widgets() || tag == QLatin1String("QTreeView") || tag == QLatin1String("QTreeWidget") || tag == QLatin1String("QWorkspace")) - QSKIP("This type of widget is not currently strongly exception safe", SkipSingle); + QSKIP("This type of widget is not currently strongly exception safe"); QFETCH(AbstractTester *, widgetCreator); @@ -766,7 +766,7 @@ void tst_ExceptionSafety_Objects::vector() if (QLatin1String(QTest::currentDataTag()) == QLatin1String("insert static") || QLatin1String(QTest::currentDataTag()) == QLatin1String("insert moveable")) - QSKIP("QVector::insert is currently not strongly exception safe", SkipSingle); + QSKIP("QVector::insert is currently not strongly exception safe"); doOOMTest(testFunction, 0); } diff --git a/tests/auto/integrationtests/lancelot/tst_lancelot.cpp b/tests/auto/integrationtests/lancelot/tst_lancelot.cpp index 07ed74ec6a..cbbd28dc82 100644 --- a/tests/auto/integrationtests/lancelot/tst_lancelot.cpp +++ b/tests/auto/integrationtests/lancelot/tst_lancelot.cpp @@ -112,7 +112,7 @@ void tst_Lancelot::initTestCase() // caused by environment or server instability if (!proto.connect(QLatin1String("tst_Lancelot"), &dryRunMode, clientInfo)) - QSKIP(qPrintable(proto.errorMessage()), SkipAll); + QSKIP(qPrintable(proto.errorMessage())); #if defined(USE_RUNTIME_DIR) scriptsDir = QCoreApplication::applicationDirPath() + "/scripts/"; @@ -123,7 +123,7 @@ void tst_Lancelot::initTestCase() QStringList files = qpsDir.entryList(QStringList() << QLatin1String("*.qps"), QDir::Files | QDir::Readable); if (files.isEmpty()) { QWARN("No qps script files found in " + qpsDir.path().toLatin1()); - QSKIP("Aborted due to errors.", SkipAll); + QSKIP("Aborted due to errors."); } baseList.resize(files.count()); @@ -144,7 +144,7 @@ void tst_Lancelot::testRasterARGB32PM_data() { QStringList localBlacklist; if (!setupTestSuite(localBlacklist)) - QSKIP("Communication with baseline image server failed.", SkipAll); + QSKIP("Communication with baseline image server failed."); } @@ -158,7 +158,7 @@ void tst_Lancelot::testRasterRGB32_data() { QStringList localBlacklist; if (!setupTestSuite(localBlacklist)) - QSKIP("Communication with baseline image server failed.", SkipAll); + QSKIP("Communication with baseline image server failed."); } @@ -172,7 +172,7 @@ void tst_Lancelot::testRasterRGB16_data() { QStringList localBlacklist; if (!setupTestSuite(localBlacklist)) - QSKIP("Communication with baseline image server failed.", SkipAll); + QSKIP("Communication with baseline image server failed."); } @@ -187,7 +187,7 @@ void tst_Lancelot::testOpenGL_data() { QStringList localBlacklist = QStringList() << QLatin1String("rasterops.qps"); if (!setupTestSuite(localBlacklist)) - QSKIP("Communication with baseline image server failed.", SkipAll); + QSKIP("Communication with baseline image server failed."); } @@ -207,7 +207,7 @@ void tst_Lancelot::testOpenGL() if (ok) runTestSuite(OpenGL, QImage::Format_RGB32); else - QSKIP("System under test does not meet preconditions for GL testing. Skipping.", SkipAll); + QSKIP("System under test does not meet preconditions for GL testing. Skipping."); } #endif @@ -235,17 +235,17 @@ void tst_Lancelot::runTestSuite(GraphicsEngine engine, QImage::Format format) QFETCH(ImageItem, baseline); if (baseline.status == ImageItem::IgnoreItem) - QSKIP("Blacklisted by baseline server.", SkipSingle); + QSKIP("Blacklisted by baseline server."); ImageItem rendered = render(baseline, engine, format); static int consecutiveErrs = 0; if (rendered.image.isNull()) { // Assume an error in the test environment, not Qt QWARN("Error: Failed to render image."); if (++consecutiveErrs < 3) { - QSKIP("Aborted due to errors.", SkipSingle); + QSKIP("Aborted due to errors."); } else { consecutiveErrs = 0; - QSKIP("Too many errors, skipping rest of testfunction.", SkipAll); + QSKIP("Too many errors, skipping rest of testfunction."); } } else { consecutiveErrs = 0; @@ -255,7 +255,7 @@ void tst_Lancelot::runTestSuite(GraphicsEngine engine, QImage::Format format) if (baseline.status == ImageItem::BaselineNotFound) { if (!proto.submitNewBaseline(rendered, 0)) QWARN("Failed to submit new baseline: " + proto.errorMessage().toLatin1()); - QSKIP("Baseline not found; new baseline created.", SkipSingle); + QSKIP("Baseline not found; new baseline created."); } if (!baseline.imageChecksums.contains(rendered.imageChecksums.at(0))) { diff --git a/tests/auto/integrationtests/languagechange/tst_languagechange.cpp b/tests/auto/integrationtests/languagechange/tst_languagechange.cpp index 5e97fd709e..5f7b2c1539 100644 --- a/tests/auto/integrationtests/languagechange/tst_languagechange.cpp +++ b/tests/auto/integrationtests/languagechange/tst_languagechange.cpp @@ -217,14 +217,14 @@ void tst_languageChange::retranslatability() case ColorDialog: #ifdef Q_WS_MAC - QSKIP("The native color dialog is used on Mac OS", SkipSingle); + QSKIP("The native color dialog is used on Mac OS"); #else (void)QColorDialog::getColor(); #endif break; case FileDialog: { #ifdef Q_WS_MAC - QSKIP("The native file dialog is used on Mac OS", SkipSingle); + QSKIP("The native file dialog is used on Mac OS"); #endif QFileDialog dlg; dlg.setOption(QFileDialog::DontUseNativeDialog); diff --git a/tests/auto/integrationtests/networkselftest/tst_networkselftest.cpp b/tests/auto/integrationtests/networkselftest/tst_networkselftest.cpp index 341054c533..1cf2060809 100644 --- a/tests/auto/integrationtests/networkselftest/tst_networkselftest.cpp +++ b/tests/auto/integrationtests/networkselftest/tst_networkselftest.cpp @@ -990,16 +990,16 @@ void tst_NetworkSelfTest::smbServer() QProcess smbclient; smbclient.start(progname, QIODevice::ReadOnly); if (!smbclient.waitForStarted(2000)) - QSKIP("Could not find smbclient (from Samba), cannot continue testing", SkipAll); + QSKIP("Could not find smbclient (from Samba), cannot continue testing"); if (!smbclient.waitForFinished(2000) || smbclient.exitStatus() != QProcess::NormalExit) - QSKIP("smbclient isn't working, cannot continue testing", SkipAll); + QSKIP("smbclient isn't working, cannot continue testing"); smbclient.close(); // try listing the server smbclient.start(progname, QStringList() << "-g" << "-N" << "-L" << QtNetworkSettings::winServerName(), QIODevice::ReadOnly); QVERIFY(smbclient.waitForFinished(5000)); if (smbclient.exitStatus() != QProcess::NormalExit) - QSKIP("smbclient crashed", SkipAll); + QSKIP("smbclient crashed"); QVERIFY2(smbclient.exitCode() == 0, "Test server not found"); QByteArray output = smbclient.readAll(); @@ -1016,7 +1016,7 @@ void tst_NetworkSelfTest::smbServer() << QString("\\\\%1\\testshare").arg(QtNetworkSettings::winServerName()), QIODevice::ReadOnly); QVERIFY(smbclient.waitForFinished(5000)); if (smbclient.exitStatus() != QProcess::NormalExit) - QSKIP("smbclient crashed", SkipAll); + QSKIP("smbclient crashed"); QVERIFY2(smbclient.exitCode() == 0, "File //qt-test-server/testshare/test.pri not found"); output = smbclient.readAll(); diff --git a/tests/auto/integrationtests/qaccessibility/tst_qaccessibility.cpp b/tests/auto/integrationtests/qaccessibility/tst_qaccessibility.cpp index e1bd968534..fdd120eb7c 100644 --- a/tests/auto/integrationtests/qaccessibility/tst_qaccessibility.cpp +++ b/tests/auto/integrationtests/qaccessibility/tst_qaccessibility.cpp @@ -1417,9 +1417,8 @@ void tst_QAccessibility::menuTest() QCOMPARE(iAction->role(), QAccessible::MenuItem); #ifndef Q_WS_MAC #ifdef Q_OS_WINCE - if (!IsValidCEPlatform()) { - QSKIP("Tests do not work on Mobile platforms due to native menus", SkipAll); - } + if (!IsValidCEPlatform()) + QSKIP("Tests do not work on Mobile platforms due to native menus"); #endif QCOMPARE(mw.mapFromGlobal(interface->rect().topLeft()), mw.menuBar()->geometry().topLeft()); QCOMPARE(interface->rect().size(), mw.menuBar()->size()); @@ -3224,9 +3223,8 @@ void tst_QAccessibility::dockWidgetTest() void tst_QAccessibility::comboBoxTest() { #if defined(Q_OS_WINCE) - if (!IsValidCEPlatform()) { - QSKIP("Test skipped on Windows Mobile test hardware", SkipAll); - } + if (!IsValidCEPlatform()) + QSKIP("Test skipped on Windows Mobile test hardware"); #endif { // not editable combobox QComboBox combo; diff --git a/tests/auto/integrationtests/windowsmobile/test/tst_windowsmobile.cpp b/tests/auto/integrationtests/windowsmobile/test/tst_windowsmobile.cpp index 0dc7f578c1..4318de7991 100644 --- a/tests/auto/integrationtests/windowsmobile/test/tst_windowsmobile.cpp +++ b/tests/auto/integrationtests/windowsmobile/test/tst_windowsmobile.cpp @@ -155,7 +155,7 @@ void takeScreenShot(const QString filename) void tst_WindowsMobile::testMainWindowAndMenuBar() { if (qt_wince_is_smartphone()) - QSKIP("This test is only for Windows Mobile", SkipAll); + QSKIP("This test is only for Windows Mobile"); QProcess process; process.start("testQMenuBar.exe"); @@ -171,7 +171,7 @@ void tst_WindowsMobile::testMainWindowAndMenuBar() void tst_WindowsMobile::testSimpleWidget() { if (qt_wince_is_smartphone()) - QSKIP("This test is only for Windows Mobile", SkipAll); + QSKIP("This test is only for Windows Mobile"); QMenuBar menubar; menubar.show(); diff --git a/tests/auto/network/access/qabstractnetworkcache/tst_qabstractnetworkcache.cpp b/tests/auto/network/access/qabstractnetworkcache/tst_qabstractnetworkcache.cpp index d507c93cf5..614096df15 100644 --- a/tests/auto/network/access/qabstractnetworkcache/tst_qabstractnetworkcache.cpp +++ b/tests/auto/network/access/qabstractnetworkcache/tst_qabstractnetworkcache.cpp @@ -341,7 +341,7 @@ void tst_QAbstractNetworkCache::check() void tst_QAbstractNetworkCache::checkSynchronous() { - QSKIP("not working yet, see QTBUG-15221", SkipAll); + QSKIP("not working yet, see QTBUG-15221"); QFETCH(QNetworkRequest::CacheLoadControl, cacheLoadControl); QFETCH(QString, url); diff --git a/tests/auto/network/access/qftp/tst_qftp.cpp b/tests/auto/network/access/qftp/tst_qftp.cpp index d88ce676e2..87a4dbfc02 100644 --- a/tests/auto/network/access/qftp/tst_qftp.cpp +++ b/tests/auto/network/access/qftp/tst_qftp.cpp @@ -350,7 +350,7 @@ void tst_QFtp::connectToUnresponsiveHost() { QFETCH_GLOBAL(bool, setProxy); if (setProxy) - QSKIP( "This test takes too long if we test with proxies too", SkipSingle ); + QSKIP( "This test takes too long if we test with proxies too"); QString host = "192.0.2.42"; // IP out of TEST-NET, should be unreachable uint port = 21; @@ -759,9 +759,8 @@ void tst_QFtp::put() QFETCH_GLOBAL(bool, setProxy); if (setProxy) { QFETCH_GLOBAL(int, proxyType); - if (proxyType == QNetworkProxy::Socks5Proxy) { - QSKIP("With socks5 the put() test takes too long time on Windows.", SkipAll); - } + if (proxyType == QNetworkProxy::Socks5Proxy) + QSKIP("With socks5 the put() test takes too long time on Windows."); } #endif @@ -2075,7 +2074,7 @@ void tst_QFtp::doneSignal() void tst_QFtp::queueMoreCommandsInDoneSlot() { - QSKIP("Task 127050 && 113966", SkipSingle); + QSKIP("Task 127050 && 113966"); QFtp ftp; QSignalSpy doneSpy(&ftp, SIGNAL(done(bool))); diff --git a/tests/auto/network/access/qhttp/tst_qhttp.cpp b/tests/auto/network/access/qhttp/tst_qhttp.cpp index d73a191ebc..7150400c4f 100644 --- a/tests/auto/network/access/qhttp/tst_qhttp.cpp +++ b/tests/auto/network/access/qhttp/tst_qhttp.cpp @@ -1337,7 +1337,7 @@ void tst_QHttp::proxyAuthenticationRequired(const QNetworkProxy &, QAuthenticato void tst_QHttp::postAuthNtlm() { - QSKIP("NTLM not working", SkipAll); + QSKIP("NTLM not working"); QHostInfo info = QHostInfo::fromName(QHostInfo::localHostName()); QByteArray postData("Hello World"); diff --git a/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp index 4d4aca6517..2c6718153b 100644 --- a/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp +++ b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp @@ -2254,7 +2254,7 @@ void tst_QNetworkReply::putToHttpMultipart_data() void tst_QNetworkReply::putToHttpMultipart() { - QSKIP("test server script cannot handle PUT data yet", SkipAll); + QSKIP("test server script cannot handle PUT data yet"); QFETCH(QUrl, url); static QSet<QByteArray> boundaries; @@ -3819,7 +3819,7 @@ void tst_QNetworkReply::ioPutToFileFromProcess() #ifdef Q_OS_WIN if (qstrcmp(QTest::currentDataTag(), "small") == 0) QSKIP("When passing a CR-LF-LF sequence through Windows stdio, it gets converted, " - "so this test fails. Disabled on Windows", SkipSingle); + "so this test fails. Disabled on Windows"); #endif QFile file(testFileName); @@ -4373,7 +4373,7 @@ void tst_QNetworkReply::ioGetFromBuiltinHttp_data() void tst_QNetworkReply::ioGetFromBuiltinHttp() { - QSKIP("Limiting is broken right now, check QTBUG-15065", SkipAll); + QSKIP("Limiting is broken right now, check QTBUG-15065"); QFETCH(bool, https); QFETCH(int, bufferSize); @@ -4620,7 +4620,7 @@ void tst_QNetworkReply::rateControl_data() void tst_QNetworkReply::rateControl() { - QSKIP("Test disabled -- only for manual purposes", SkipAll); + QSKIP("Test disabled -- only for manual purposes"); // this function tests that we aren't reading from the network // faster than the data is being consumed. QFETCH(int, rate); diff --git a/tests/auto/network/bearer/qnetworkconfigurationmanager/tst_qnetworkconfigurationmanager.cpp b/tests/auto/network/bearer/qnetworkconfigurationmanager/tst_qnetworkconfigurationmanager.cpp index 9ced5464a0..6b299ac459 100644 --- a/tests/auto/network/bearer/qnetworkconfigurationmanager/tst_qnetworkconfigurationmanager.cpp +++ b/tests/auto/network/bearer/qnetworkconfigurationmanager/tst_qnetworkconfigurationmanager.cpp @@ -351,7 +351,7 @@ public: void tst_QNetworkConfigurationManager::usedInThread() { #if defined Q_OS_MAC && !defined (QT_NO_COREWLAN) - QSKIP("QTBUG-19070 Mac CoreWlan plugin is broken", SkipAll); + QSKIP("QTBUG-19070 Mac CoreWlan plugin is broken"); #else QNCMTestThread thread; connect(&thread, SIGNAL(finished()), &QTestEventLoop::instance(), SLOT(exitLoop())); diff --git a/tests/auto/network/bearer/qnetworksession/test/tst_qnetworksession.cpp b/tests/auto/network/bearer/qnetworksession/test/tst_qnetworksession.cpp index 6d11fd5ccd..685c0ba696 100644 --- a/tests/auto/network/bearer/qnetworksession/test/tst_qnetworksession.cpp +++ b/tests/auto/network/bearer/qnetworksession/test/tst_qnetworksession.cpp @@ -261,15 +261,12 @@ void tst_QNetworkSession::sessionClosing() // First check that opening once succeeds and determine if test is doable QNetworkConfiguration config = suitableConfiguration(bearerType, configurationType); - if (!config.isValid()) { - QSKIP("No suitable configurations, skipping this round of repeated open-close test.", SkipSingle); - } + if (!config.isValid()) + QSKIP("No suitable configurations, skipping this round of repeated open-close test."); qDebug() << "Using following configuration to bomb with close(): " << config.name(); QNetworkSession session(config); - if (!openSession(&session) || - !closeSession(&session)) { - QSKIP("Unable to open/close session, skipping this round of close() bombing.", SkipSingle); - } + if (!openSession(&session) || !closeSession(&session)) + QSKIP("Unable to open/close session, skipping this round of close() bombing."); qDebug() << "Closing without issuing open()"; session.close(); @@ -442,15 +439,12 @@ void tst_QNetworkSession::repeatedOpenClose() // First check that opening once succeeds and determine if repeatable testing is doable QNetworkConfiguration config = suitableConfiguration(bearerType, configurationType); - if (!config.isValid()) { - QSKIP("No suitable configurations, skipping this round of repeated open-close test.", SkipSingle); - } + if (!config.isValid()) + QSKIP("No suitable configurations, skipping this round of repeated open-close test."); qDebug() << "Using following configuratio to repeatedly open and close: " << config.name(); QNetworkSession permanentSession(config); - if (!openSession(&permanentSession) || - !closeSession(&permanentSession)) { - QSKIP("Unable to open/close session, skipping this round of repeated open-close test.", SkipSingle); - } + if (!openSession(&permanentSession) || !closeSession(&permanentSession)) + QSKIP("Unable to open/close session, skipping this round of repeated open-close test."); for (int i = 0; i < repeatTimes; i++) { qDebug() << "Opening, loop number " << i; QVERIFY(openSession(&permanentSession)); @@ -468,7 +462,7 @@ void tst_QNetworkSession::userChoiceSession_data() if (config.type() == QNetworkConfiguration::UserChoice) QTest::newRow("UserChoice") << config; else - QSKIP("Default configuration is not a UserChoice configuration.", SkipAll); + QSKIP("Default configuration is not a UserChoice configuration."); } void tst_QNetworkSession::userChoiceSession() @@ -489,7 +483,7 @@ void tst_QNetworkSession::userChoiceSession() // The remaining tests require the session to be not NotAvailable. if (session.state() == QNetworkSession::NotAvailable) - QSKIP("Network is not available.", SkipSingle); + QSKIP("Network is not available."); QSignalSpy sessionOpenedSpy(&session, SIGNAL(opened())); QSignalSpy sessionClosedSpy(&session, SIGNAL(closed())); @@ -511,7 +505,7 @@ void tst_QNetworkSession::userChoiceSession() if (error == QNetworkSession::OperationNotSupportedError) { // The session needed to bring up the interface, // but the operation is not supported. - QSKIP("Configuration does not support open().", SkipSingle); + QSKIP("Configuration does not support open()."); } else if (error == QNetworkSession::InvalidConfigurationError) { // The session needed to bring up the interface, but it is not possible for the // specified configuration. @@ -519,10 +513,10 @@ void tst_QNetworkSession::userChoiceSession() QNetworkConfiguration::Discovered) { QFAIL("Failed to open session for Discovered configuration."); } else { - QSKIP("Cannot test session for non-Discovered configuration.", SkipSingle); + QSKIP("Cannot test session for non-Discovered configuration."); } } else if (error == QNetworkSession::UnknownSessionError) { - QSKIP("Unknown session error.", SkipSingle); + QSKIP("Unknown session error."); } else { QFAIL("Error opening session."); } @@ -619,7 +613,7 @@ void tst_QNetworkSession::sessionOpenCloseStop() // The remaining tests require the session to be not NotAvailable. if (session.state() == QNetworkSession::NotAvailable) - QSKIP("Network is not available.", SkipSingle); + QSKIP("Network is not available."); QSignalSpy sessionOpenedSpy(&session, SIGNAL(opened())); QSignalSpy sessionClosedSpy(&session, SIGNAL(closed())); @@ -649,7 +643,7 @@ void tst_QNetworkSession::sessionOpenCloseStop() if (error == QNetworkSession::OperationNotSupportedError) { // The session needed to bring up the interface, // but the operation is not supported. - QSKIP("Configuration does not support open().", SkipSingle); + QSKIP("Configuration does not support open()."); } else if (error == QNetworkSession::InvalidConfigurationError) { // The session needed to bring up the interface, but it is not possible for the // specified configuration. @@ -657,10 +651,10 @@ void tst_QNetworkSession::sessionOpenCloseStop() QNetworkConfiguration::Discovered) { QFAIL("Failed to open session for Discovered configuration."); } else { - QSKIP("Cannot test session for non-Discovered configuration.", SkipSingle); + QSKIP("Cannot test session for non-Discovered configuration."); } } else if (error == QNetworkSession::UnknownSessionError) { - QSKIP("Unknown Session error.", SkipSingle); + QSKIP("Unknown Session error."); } else { QFAIL("Error opening session."); } @@ -779,7 +773,7 @@ void tst_QNetworkSession::sessionOpenCloseStop() if (error == QNetworkSession::OperationNotSupportedError) { // The session needed to bring down the interface, // but the operation is not supported. - QSKIP("Configuration does not support stop().", SkipSingle); + QSKIP("Configuration does not support stop()."); } else if (error == QNetworkSession::InvalidConfigurationError) { // The session needed to bring down the interface, but it is not possible for the // specified configuration. @@ -787,7 +781,7 @@ void tst_QNetworkSession::sessionOpenCloseStop() QNetworkConfiguration::Discovered) { QFAIL("Failed to stop session for Discovered configuration."); } else { - QSKIP("Cannot test session for non-Discovered configuration.", SkipSingle); + QSKIP("Cannot test session for non-Discovered configuration."); } } else { QFAIL("Error stopping session."); @@ -958,7 +952,7 @@ void tst_QNetworkSession::sessionOpenCloseStop() if (error == QNetworkSession::OperationNotSupportedError) { // The session needed to bring down the interface, // but the operation is not supported. - QSKIP("Configuration does not support close().", SkipSingle); + QSKIP("Configuration does not support close()."); } else if (error == QNetworkSession::InvalidConfigurationError) { // The session needed to bring down the interface, but it is not possible for the // specified configuration. @@ -966,7 +960,7 @@ void tst_QNetworkSession::sessionOpenCloseStop() QNetworkConfiguration::Discovered) { QFAIL("Failed to close session for Discovered configuration."); } else { - QSKIP("Cannot test session for non-Discovered configuration.", SkipSingle); + QSKIP("Cannot test session for non-Discovered configuration."); } } else { QFAIL("Error closing session."); @@ -1090,11 +1084,11 @@ void tst_QNetworkSession::outOfProcessSession() qDebug("Lackey returned exit success (0)"); break; case 1: - QSKIP("No discovered configurations found.", SkipAll); + QSKIP("No discovered configurations found."); case 2: - QSKIP("Lackey could not start session.", SkipAll); + QSKIP("Lackey could not start session."); default: - QSKIP("Lackey failed", SkipAll); + QSKIP("Lackey failed"); } } @@ -1319,7 +1313,7 @@ void tst_QNetworkSession::sessionAutoClose_data() } if (!testData) - QSKIP("No applicable configurations to test", SkipAll); + QSKIP("No applicable configurations to test"); } void tst_QNetworkSession::sessionAutoClose() @@ -1343,7 +1337,7 @@ void tst_QNetworkSession::sessionAutoClose() session.waitForOpened(); if (!session.isOpen()) - QSKIP("Session not open", SkipSingle); + QSKIP("Session not open"); // set session to auto close at next polling interval. session.setSessionProperty(QLatin1String("AutoCloseSessionTimeout"), 0); diff --git a/tests/auto/network/kernel/qhostinfo/tst_qhostinfo.cpp b/tests/auto/network/kernel/qhostinfo/tst_qhostinfo.cpp index 3e0437f3c8..e9acf686f0 100644 --- a/tests/auto/network/kernel/qhostinfo/tst_qhostinfo.cpp +++ b/tests/auto/network/kernel/qhostinfo/tst_qhostinfo.cpp @@ -328,7 +328,7 @@ void tst_QHostInfo::lookupIPv6() QFETCH(QString, addresses); if (!ipv6LookupsAvailable) - QSKIP("This platform does not support IPv6 lookups", SkipAll); + QSKIP("This platform does not support IPv6 lookups"); lookupDone = false; QHostInfo::lookupHost(hostname, this, SLOT(resultsReady(const QHostInfo&))); @@ -371,11 +371,11 @@ void tst_QHostInfo::reverseLookup() QFETCH(int, err); if (!ipv6LookupsAvailable && hostNames.contains("classical.hexago.com")) { - QSKIP("IPv6 lookups are not supported on this platform", SkipSingle); + QSKIP("IPv6 lookups are not supported on this platform"); } #if defined(Q_OS_HPUX) && defined(__ia64) if (hostNames.contains("classical.hexago.com")) - QSKIP("HP-UX 11i does not support IPv6 reverse lookups.", SkipSingle); + QSKIP("HP-UX 11i does not support IPv6 reverse lookups."); #endif QHostInfo info = QHostInfo::fromName(address); diff --git a/tests/auto/network/kernel/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp b/tests/auto/network/kernel/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp index 0540bc8408..de06a54447 100644 --- a/tests/auto/network/kernel/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp +++ b/tests/auto/network/kernel/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp @@ -226,7 +226,7 @@ void tst_QNetworkProxyFactory::inNetworkAccessManager() if (count == factory->requestCounter) { //RND phones are preconfigured with several test access points which won't work without a matching SIM //If the network fails to start, QNAM won't ask the factory for proxies so we can't test. - QSKIP("network configuration didn't start", SkipSingle); + QSKIP("network configuration didn't start"); } qDebug() << "testing network configuration for" << config.name(); diff --git a/tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp b/tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp index d982666931..f96ad2781e 100644 --- a/tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp +++ b/tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp @@ -283,7 +283,7 @@ void tst_QTcpServer::dualStack() { QFETCH_GLOBAL(bool, setProxy); if (setProxy) - QSKIP("test server proxy doesn't support ipv6", SkipSingle); + QSKIP("test server proxy doesn't support ipv6"); QFETCH(QHostAddress, bindAddress); QFETCH(bool, v4ok); QFETCH(bool, v6ok); @@ -349,9 +349,8 @@ void tst_QTcpServer::maxPendingConnections() QFETCH_GLOBAL(bool, setProxy); if (setProxy) { QFETCH_GLOBAL(int, proxyType); - if (proxyType == QNetworkProxy::Socks5Proxy) { - QSKIP("With socks5 only 1 connection is allowed ever", SkipAll); - } + if (proxyType == QNetworkProxy::Socks5Proxy) + QSKIP("With socks5 only 1 connection is allowed ever"); } //### sees to fail sometimes ... a timing issue with the test on windows QTcpServer server; @@ -388,9 +387,8 @@ void tst_QTcpServer::listenError() QFETCH_GLOBAL(bool, setProxy); if (setProxy) { QFETCH_GLOBAL(int, proxyType); - if (proxyType == QNetworkProxy::Socks5Proxy) { - QSKIP("With socks5 we can not make hard requirements on the address or port", SkipAll); - } + if (proxyType == QNetworkProxy::Socks5Proxy) + QSKIP("With socks5 we can not make hard requirements on the address or port"); } QTcpServer server; QVERIFY(!server.listen(QHostAddress("1.2.3.4"), 0)); @@ -435,9 +433,8 @@ void tst_QTcpServer::waitForConnectionTest() QFETCH_GLOBAL(bool, setProxy); if (setProxy) { QFETCH_GLOBAL(int, proxyType); - if (proxyType == QNetworkProxy::Socks5Proxy) { - QSKIP("Localhost servers don't work well with SOCKS5", SkipAll); - } + if (proxyType == QNetworkProxy::Socks5Proxy) + QSKIP("Localhost servers don't work well with SOCKS5"); } QTcpSocket findLocalIpSocket; @@ -533,9 +530,8 @@ void tst_QTcpServer::addressReusable() QFETCH_GLOBAL(bool, setProxy); if (setProxy) { QFETCH_GLOBAL(int, proxyType); - if (proxyType == QNetworkProxy::Socks5Proxy) { - QSKIP("With socks5 this test does not make senans at the momment", SkipAll); - } + if (proxyType == QNetworkProxy::Socks5Proxy) + QSKIP("With socks5 this test does not make senans at the momment"); } #if defined(Q_OS_WINCE) QString signalName = QString::fromLatin1("/test_signal.txt"); @@ -574,9 +570,8 @@ void tst_QTcpServer::setNewSocketDescriptorBlocking() QFETCH_GLOBAL(bool, setProxy); if (setProxy) { QFETCH_GLOBAL(int, proxyType); - if (proxyType == QNetworkProxy::Socks5Proxy) { - QSKIP("With socks5 we can not make the socket descripter blocking", SkipAll); - } + if (proxyType == QNetworkProxy::Socks5Proxy) + QSKIP("With socks5 we can not make the socket descripter blocking"); } SeverWithBlockingSockets server; QVERIFY(server.listen()); diff --git a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp index 95ab719405..46f8111945 100644 --- a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp +++ b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp @@ -1040,7 +1040,7 @@ void tst_QTcpSocket::disconnectWhileConnecting() if (!data.isEmpty()) socket->write(data); if (socket->state() == QAbstractSocket::ConnectedState) - QSKIP("localhost connections are immediate, test case is invalid", SkipSingle); + QSKIP("localhost connections are immediate, test case is invalid"); QFETCH(bool, closeDirectly); if (closeDirectly) { @@ -1156,9 +1156,8 @@ void tst_QTcpSocket::disconnectWhileConnectingNoEventLoop() socket->connectToHost("127.0.0.1", thread->serverPort); if (!data.isEmpty()) socket->write(data); - if (socket->state() == QAbstractSocket::ConnectedState) { - QSKIP("localhost connections are immediate, test case is invalid", SkipSingle); - } + if (socket->state() == QAbstractSocket::ConnectedState) + QSKIP("localhost connections are immediate, test case is invalid"); QFETCH(bool, closeDirectly); if (closeDirectly) { @@ -2224,14 +2223,14 @@ void tst_QTcpSocket::suddenRemoteDisconnect() #ifndef Q_OS_VXWORKS void tst_QTcpSocket::connectToMultiIP() { - QSKIP("TODO: setup DNS in the new network", SkipAll); + QSKIP("TODO: setup DNS in the new network"); QFETCH_GLOBAL(bool, ssl); if (ssl) return; QFETCH_GLOBAL(bool, setProxy); if (setProxy) - QSKIP("This test takes too long if we also add the proxies.", SkipSingle); + QSKIP("This test takes too long if we also add the proxies."); qDebug("Please wait, this test can take a while..."); diff --git a/tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp b/tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp index b2cbe11796..a44d724d63 100644 --- a/tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp +++ b/tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp @@ -246,9 +246,8 @@ void tst_QUdpSocket::broadcasting() QFETCH_GLOBAL(bool, setProxy); if (setProxy) { QFETCH_GLOBAL(int, proxyType); - if (proxyType == QNetworkProxy::Socks5Proxy) { - QSKIP("With socks5 Broadcast is not supported.", SkipSingle); - } + if (proxyType == QNetworkProxy::Socks5Proxy) + QSKIP("With socks5 Broadcast is not supported."); } const char *message[] = {"Yo mista", "", "Yo", "Wassap"}; @@ -261,7 +260,7 @@ void tst_QUdpSocket::broadcasting() } } if (broadcastAddresses.isEmpty()) - QSKIP("No interface can broadcast", SkipAll); + QSKIP("No interface can broadcast"); for (int i = 0; i < 4; ++i) { QUdpSocket serverSocket; #ifdef FORCE_SESSION @@ -432,7 +431,7 @@ void tst_QUdpSocket::dualStack() { QFETCH_GLOBAL(bool, setProxy); if (setProxy) - QSKIP("test server SOCKS proxy doesn't support IPv6", SkipSingle); + QSKIP("test server SOCKS proxy doesn't support IPv6"); QUdpSocket dualSock; QByteArray dualData("dual"); QVERIFY(dualSock.bind(QHostAddress(QHostAddress::Any), 0)); @@ -545,26 +544,23 @@ void tst_QUdpSocket::pendingDatagramSize() QCOMPARE(server.readDatagram(&c, 1), qint64(1)); QCOMPARE(c, 't'); c = '\0'; - } else { - QSKIP("does not have the 1st datagram", SkipSingle); - } + } else + QSKIP("does not have the 1st datagram"); if (server.hasPendingDatagrams()) { QCOMPARE(server.pendingDatagramSize(), qint64(0)); QCOMPARE(server.readDatagram(&c, 1), qint64(0)); QCOMPARE(c, '\0'); // untouched - c = '\0'; - } else { - QSKIP("does not have the 2nd datagram", SkipSingle); - } + c = '\0'; + } else + QSKIP("does not have the 2nd datagram"); if (server.hasPendingDatagrams()) { QCOMPARE(server.pendingDatagramSize(), qint64(10)); QCOMPARE(server.readDatagram(&c, 1), qint64(1)); QCOMPARE(c, '3'); - } else { - QSKIP("does not have the 3rd datagram", SkipSingle); - } + } else + QSKIP("does not have the 3rd datagram"); } @@ -597,7 +593,7 @@ void tst_QUdpSocket::writeDatagram() if (written != i * 1024) { #if defined (Q_OS_HPUX) - QSKIP("HP-UX 11.11 on hai (PA-RISC 64) truncates too long datagrams.", SkipSingle); + QSKIP("HP-UX 11.11 on hai (PA-RISC 64) truncates too long datagrams."); #endif QCOMPARE(bytesspy.count(), 0); QCOMPARE(errorspy.count(), 1); @@ -610,9 +606,8 @@ void tst_QUdpSocket::writeDatagram() QCOMPARE(*static_cast<const qint64 *>(bytesspy.at(0).at(0).constData()), qint64(i * 1024)); QCOMPARE(errorspy.count(), 0); - if (!server.waitForReadyRead(5000)) { - QSKIP(QString("UDP packet lost at size %1, unable to complete the test.").arg(i * 1024).toLatin1().data(), SkipSingle); - } + if (!server.waitForReadyRead(5000)) + QSKIP(QString("UDP packet lost at size %1, unable to complete the test.").arg(i * 1024).toLatin1().data()); QCOMPARE(server.pendingDatagramSize(), qint64(i * 1024)); QCOMPARE(server.readDatagram(0, 0), qint64(0)); } @@ -663,9 +658,8 @@ void tst_QUdpSocket::bindMode() QFETCH_GLOBAL(bool, setProxy); if (setProxy) { QFETCH_GLOBAL(int, proxyType); - if (proxyType == QNetworkProxy::Socks5Proxy) { - QSKIP("With socks5 explicit port binding is not supported.", SkipAll); - } + if (proxyType == QNetworkProxy::Socks5Proxy) + QSKIP("With socks5 explicit port binding is not supported."); } QUdpSocket socket; @@ -745,7 +739,7 @@ void tst_QUdpSocket::writeToNonExistingPeer_data() void tst_QUdpSocket::writeToNonExistingPeer() { - QSKIP("Connected-mode UDP sockets and their behaviour are erratic", SkipAll); + QSKIP("Connected-mode UDP sockets and their behaviour are erratic"); QFETCH(QHostAddress, peerAddress); quint16 peerPort = 34534; qRegisterMetaType<QAbstractSocket::SocketError>("QAbstractSocket::SocketError"); @@ -1058,9 +1052,8 @@ void tst_QUdpSocket::multicastLeaveAfterClose() { QFETCH_GLOBAL(bool, setProxy); QFETCH(QHostAddress, groupAddress); - if (setProxy) { - QSKIP("UDP Multicast does not work with proxies", SkipAll); - } + if (setProxy) + QSKIP("UDP Multicast does not work with proxies"); QUdpSocket udpSocket; #ifdef FORCE_SESSION diff --git a/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp b/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp index eaf9cb3347..0509c2f489 100644 --- a/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp +++ b/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp @@ -1269,7 +1269,7 @@ void tst_QSslSocket::wildcardCertificateNames() void tst_QSslSocket::wildcard() { - QSKIP("TODO: solve wildcard problem", SkipAll); + QSKIP("TODO: solve wildcard problem"); if (!QSslSocket::supportsSsl()) return; diff --git a/tests/auto/opengl/qgl/tst_qgl.cpp b/tests/auto/opengl/qgl/tst_qgl.cpp index e1c3462560..c9b4800b53 100644 --- a/tests/auto/opengl/qgl/tst_qgl.cpp +++ b/tests/auto/opengl/qgl/tst_qgl.cpp @@ -145,7 +145,7 @@ static int appDefaultDepth() void tst_QGL::getSetCheck() { if (!QGLFormat::hasOpenGL()) - QSKIP("QGL not supported on this platform", SkipAll); + QSKIP("QGL not supported on this platform"); QGLFormat obj1; // int QGLFormat::depthBufferSize() @@ -656,7 +656,7 @@ void tst_QGL::openGLVersionCheck() { #ifdef QT_BUILD_INTERNAL if (!QGLFormat::hasOpenGL()) - QSKIP("QGL not supported on this platform", SkipAll); + QSKIP("QGL not supported on this platform"); QString versionString; QGLFormat::OpenGLVersionFlags expectedFlag; @@ -895,7 +895,7 @@ void tst_QGL::partialGLWidgetUpdates_data() void tst_QGL::partialGLWidgetUpdates() { if (!QGLFormat::hasOpenGL()) - QSKIP("QGL not supported on this platform", SkipAll); + QSKIP("QGL not supported on this platform"); QFETCH(bool, doubleBufferedContext); QFETCH(bool, autoFillBackground); @@ -923,7 +923,7 @@ void tst_QGL::partialGLWidgetUpdates() QTest::qWait(200); if (widget.format().doubleBuffer() != doubleBufferedContext) - QSKIP("Platform does not support requested format", SkipAll); + QSKIP("Platform does not support requested format"); widget.paintEventRegion = QRegion(); widget.repaint(50, 50, 50, 50); @@ -939,7 +939,7 @@ void tst_QGL::partialGLWidgetUpdates() void tst_QGL::glPBufferRendering() { if (!QGLPixelBuffer::hasOpenGLPbuffers()) - QSKIP("QGLPixelBuffer not supported on this platform", SkipSingle); + QSKIP("QGLPixelBuffer not supported on this platform"); QGLPixelBuffer* pbuf = new QGLPixelBuffer(128, 128); @@ -1063,7 +1063,7 @@ void tst_QGL::glWidgetRendering() void tst_QGL::glFBOSimpleRendering() { if (!QGLFramebufferObject::hasOpenGLFramebufferObjects()) - QSKIP("QGLFramebufferObject not supported on this platform", SkipSingle); + QSKIP("QGLFramebufferObject not supported on this platform"); QGLWidget glw; glw.makeCurrent(); @@ -1097,7 +1097,7 @@ void tst_QGL::glFBOSimpleRendering() void tst_QGL::glFBORendering() { if (!QGLFramebufferObject::hasOpenGLFramebufferObjects()) - QSKIP("QGLFramebufferObject not supported on this platform", SkipSingle); + QSKIP("QGLFramebufferObject not supported on this platform"); QGLWidget glw; glw.makeCurrent(); @@ -1111,7 +1111,7 @@ void tst_QGL::glFBORendering() if (fbo->attachment() != QGLFramebufferObject::CombinedDepthStencil) { delete fbo; - QSKIP("FBOs missing combined depth~stencil support", SkipSingle); + QSKIP("FBOs missing combined depth~stencil support"); } QPainter fboPainter; @@ -1135,7 +1135,7 @@ void tst_QGL::glFBORendering() void tst_QGL::multipleFBOInterleavedRendering() { if (!QGLFramebufferObject::hasOpenGLFramebufferObjects()) - QSKIP("QGLFramebufferObject not supported on this platform", SkipSingle); + QSKIP("QGLFramebufferObject not supported on this platform"); QGLWidget glw; glw.makeCurrent(); @@ -1155,7 +1155,7 @@ void tst_QGL::multipleFBOInterleavedRendering() delete fbo1; delete fbo2; delete fbo3; - QSKIP("FBOs missing combined depth~stencil support", SkipSingle); + QSKIP("FBOs missing combined depth~stencil support"); } QPainter fbo1Painter; @@ -1169,7 +1169,7 @@ void tst_QGL::multipleFBOInterleavedRendering() // Confirm we're using the GL2 engine, as interleaved rendering isn't supported // on the GL1 engine: if (fbo1Painter.paintEngine()->type() != QPaintEngine::OpenGL2) - QSKIP("Interleaved GL rendering requires OpenGL 2.0 or higher", SkipSingle); + QSKIP("Interleaved GL rendering requires OpenGL 2.0 or higher"); QPainterPath intersectingPath; intersectingPath.moveTo(0, 0); @@ -1282,7 +1282,7 @@ protected: void tst_QGL::glFBOUseInGLWidget() { if (!QGLFramebufferObject::hasOpenGLFramebufferObjects()) - QSKIP("QGLFramebufferObject not supported on this platform", SkipSingle); + QSKIP("QGLFramebufferObject not supported on this platform"); FBOUseInGLWidget w; #ifdef Q_WS_QWS @@ -1401,7 +1401,7 @@ void tst_QGL::glWidgetRenderPixmap() reference.fill(0xffff0000); #if defined(QGL_EGL) && !defined(Q_WS_X11) - QSKIP("renderPixmap() not yet supported under EGL on your platform", SkipAll); + QSKIP("renderPixmap() not yet supported under EGL on your platform"); #endif QFUZZY_COMPARE_IMAGES(fb, reference); @@ -1825,7 +1825,7 @@ void tst_QGL::clipTest() void tst_QGL::destroyFBOAfterContext() { if (!QGLFramebufferObject::hasOpenGLFramebufferObjects()) - QSKIP("QGLFramebufferObject not supported on this platform", SkipSingle); + QSKIP("QGLFramebufferObject not supported on this platform"); QGLWidget *glw = new QGLWidget(); glw->makeCurrent(); @@ -1896,7 +1896,7 @@ void tst_QGL::shareRegister() if (!glw2->isSharing()) { delete glw2; delete glw1; - QSKIP("Context sharing is not supported", SkipSingle); + QSKIP("Context sharing is not supported"); } QVERIFY(glw1->isSharing()); QVERIFY(glw1->context() != glw2->context()); @@ -2352,7 +2352,7 @@ void tst_QGL::threadImages() void tst_QGL::nullRectCrash() { if (!QGLFramebufferObject::hasOpenGLFramebufferObjects()) - QSKIP("QGLFramebufferObject not supported on this platform", SkipSingle); + QSKIP("QGLFramebufferObject not supported on this platform"); QGLWidget glw; glw.makeCurrent(); @@ -2380,7 +2380,7 @@ public: private slots: void qglSkipTests() { - QSKIP("QGL not supported on this system.", SkipAll); + QSKIP("QGL not supported on this system."); } }; diff --git a/tests/auto/opengl/qglbuffer/tst_qglbuffer.cpp b/tests/auto/opengl/qglbuffer/tst_qglbuffer.cpp index 9215b5fedd..399d624027 100644 --- a/tests/auto/opengl/qglbuffer/tst_qglbuffer.cpp +++ b/tests/auto/opengl/qglbuffer/tst_qglbuffer.cpp @@ -110,7 +110,7 @@ void tst_QGLBuffer::testBuffer(QGLBuffer::Type type) // Create the buffer - if this fails, then assume that the // GL implementation does not support buffers at all. if (!buffer.create()) - QSKIP("Buffers are not supported on this platform", SkipAll); + QSKIP("Buffers are not supported on this platform"); // Should now have a buffer id. QVERIFY(buffer.bufferId() != 0); @@ -209,13 +209,13 @@ void tst_QGLBuffer::bufferSharing() if (!w2->isSharing()) { delete w2; delete w1; - QSKIP("Context sharing is not supported on this platform", SkipSingle); + QSKIP("Context sharing is not supported on this platform"); } // Bind the buffer in the first context and write some data to it. QGLBuffer buffer(QGLBuffer::VertexBuffer); if (!buffer.create()) - QSKIP("Buffers are not supported on this platform", SkipSingle); + QSKIP("Buffers are not supported on this platform"); QVERIFY(buffer.isCreated()); QVERIFY(buffer.bind()); static GLfloat const data[] = {1, 2, 3, 4, 5, 6, 7, 8, 9}; diff --git a/tests/auto/opengl/qglfunctions/tst_qglfunctions.cpp b/tests/auto/opengl/qglfunctions/tst_qglfunctions.cpp index ec87f6f857..7755d89c0b 100644 --- a/tests/auto/opengl/qglfunctions/tst_qglfunctions.cpp +++ b/tests/auto/opengl/qglfunctions/tst_qglfunctions.cpp @@ -91,7 +91,7 @@ void tst_QGLFunctions::features() // Make a context current. QGLWidget glw; if (!glw.isValid()) - QSKIP("Could not create a GL context", SkipAll); + QSKIP("Could not create a GL context"); glw.makeCurrent(); funcs.initializeGLFunctions(); @@ -195,12 +195,12 @@ void tst_QGLFunctions::multitexture() QGLFunctions funcs; QGLWidget glw; if (!glw.isValid()) - QSKIP("Could not create a GL context", SkipAll); + QSKIP("Could not create a GL context"); glw.makeCurrent(); funcs.initializeGLFunctions(); if (!funcs.hasOpenGLFeature(QGLFunctions::Multitexture)) - QSKIP("Multitexture functions are not supported", SkipSingle); + QSKIP("Multitexture functions are not supported"); funcs.glActiveTexture(GL_TEXTURE1); @@ -221,12 +221,12 @@ void tst_QGLFunctions::blendColor() QGLFunctions funcs; QGLWidget glw; if (!glw.isValid()) - QSKIP("Could not create a GL context", SkipAll); + QSKIP("Could not create a GL context"); glw.makeCurrent(); funcs.initializeGLFunctions(); if (!funcs.hasOpenGLFeature(QGLFunctions::BlendColor)) - QSKIP("glBlendColor() is not supported", SkipSingle); + QSKIP("glBlendColor() is not supported"); funcs.glBlendColor(0.0f, 1.0f, 0.0f, 1.0f); diff --git a/tests/auto/opengl/qglthreads/tst_qglthreads.cpp b/tests/auto/opengl/qglthreads/tst_qglthreads.cpp index 96624a9485..940220217d 100644 --- a/tests/auto/opengl/qglthreads/tst_qglthreads.cpp +++ b/tests/auto/opengl/qglthreads/tst_qglthreads.cpp @@ -141,7 +141,7 @@ public: void tst_QGLThreads::swapInThread() { #ifdef Q_OS_MAC - QSKIP("OpenGL threading tests are currently disabled on mac as they were causing reboots", SkipAll); + QSKIP("OpenGL threading tests are currently disabled on mac as they were causing reboots"); #endif QGLFormat format; @@ -250,7 +250,7 @@ private: void tst_QGLThreads::textureUploadInThread() { #ifdef Q_OS_MAC - QSKIP("OpenGL threading tests are currently disabled on mac as they were causing reboots", SkipAll); + QSKIP("OpenGL threading tests are currently disabled on mac as they were causing reboots"); #endif TextureDisplay display; @@ -425,7 +425,7 @@ void tst_QGLThreads::renderInThread_data() void tst_QGLThreads::renderInThread() { #ifdef Q_OS_MAC - QSKIP("OpenGL threading tests are currently disabled on Mac as they were causing reboots", SkipAll); + QSKIP("OpenGL threading tests are currently disabled on Mac as they were causing reboots"); #endif QFETCH(bool, resize); @@ -633,11 +633,11 @@ private: void tst_QGLThreads::painterOnGLWidgetInThread() { #ifdef Q_OS_MAC - QSKIP("OpenGL threading tests are currently disabled on Mac as they were causing reboots", SkipAll); + QSKIP("OpenGL threading tests are currently disabled on Mac as they were causing reboots"); #endif if (!((QGLFormat::openGLVersionFlags() & QGLFormat::OpenGL_Version_2_0) || (QGLFormat::openGLVersionFlags() & QGLFormat::OpenGL_ES_Version_2_0))) { - QSKIP("The OpenGL based threaded QPainter tests requires OpenGL/ES 2.0.", SkipAll); + QSKIP("The OpenGL based threaded QPainter tests requires OpenGL/ES 2.0."); } PaintThreadManager<GLWidgetWrapper> painterThreads(5); @@ -657,7 +657,7 @@ void tst_QGLThreads::painterOnGLWidgetInThread() void tst_QGLThreads::painterOnPixmapInThread() { #ifdef Q_WS_X11 - QSKIP("Drawing text in threads onto X11 drawables currently crashes on some X11 servers.", SkipAll); + QSKIP("Drawing text in threads onto X11 drawables currently crashes on some X11 servers."); #endif PaintThreadManager<PixmapWrapper> painterThreads(5); painterThreads.start(); @@ -675,17 +675,15 @@ void tst_QGLThreads::painterOnPixmapInThread() void tst_QGLThreads::painterOnPboInThread() { #ifdef Q_OS_MAC - QSKIP("OpenGL threading tests are currently disabled on Mac as they were causing reboots", SkipAll); + QSKIP("OpenGL threading tests are currently disabled on Mac as they were causing reboots"); #endif if (!((QGLFormat::openGLVersionFlags() & QGLFormat::OpenGL_Version_2_0) || (QGLFormat::openGLVersionFlags() & QGLFormat::OpenGL_ES_Version_2_0))) { - QSKIP("The OpenGL based threaded QPainter tests requires OpenGL/ES 2.0.", SkipAll); - return; + QSKIP("The OpenGL based threaded QPainter tests requires OpenGL/ES 2.0."); } if (!QGLPixelBuffer::hasOpenGLPbuffers()) { - QSKIP("This system doesn't support pbuffers.", SkipAll); - return; + QSKIP("This system doesn't support pbuffers."); } PaintThreadManager<PixelBufferWrapper> painterThreads(5); @@ -705,17 +703,15 @@ void tst_QGLThreads::painterOnPboInThread() void tst_QGLThreads::painterOnFboInThread() { #ifdef Q_OS_MAC - QSKIP("OpenGL threading tests are currently disabled on Mac as they were causing reboots", SkipAll); + QSKIP("OpenGL threading tests are currently disabled on Mac as they were causing reboots"); #endif if (!((QGLFormat::openGLVersionFlags() & QGLFormat::OpenGL_Version_2_0) || (QGLFormat::openGLVersionFlags() & QGLFormat::OpenGL_ES_Version_2_0))) { - QSKIP("The OpenGL based threaded QPainter tests requires OpenGL/ES 2.0.", SkipAll); - return; + QSKIP("The OpenGL based threaded QPainter tests requires OpenGL/ES 2.0."); } if (!QGLFramebufferObject::hasOpenGLFramebufferObjects()) { - QSKIP("This system doesn't support framebuffer objects.", SkipAll); - return; + QSKIP("This system doesn't support framebuffer objects."); } PaintThreadManager<FrameBufferObjectWrapper> painterThreads(5); diff --git a/tests/auto/other/atwrapper/atWrapperAutotest.cpp b/tests/auto/other/atwrapper/atWrapperAutotest.cpp index ebea316d44..0c24286d6b 100644 --- a/tests/auto/other/atwrapper/atWrapperAutotest.cpp +++ b/tests/auto/other/atwrapper/atWrapperAutotest.cpp @@ -70,7 +70,7 @@ void atWrapperAutotest::runTest() atWrapper wrapper; if (!wrapper.runAutoTests()) - QSKIP("Arthur not tested on this machine", SkipAll); + QSKIP("Arthur not tested on this machine"); QVERIFY(true); } diff --git a/tests/auto/qopengl/tst_qopengl.cpp b/tests/auto/qopengl/tst_qopengl.cpp index 61e0bb49ba..ebff56fd5c 100644 --- a/tests/auto/qopengl/tst_qopengl.cpp +++ b/tests/auto/qopengl/tst_qopengl.cpp @@ -297,7 +297,7 @@ void tst_QOpenGL::fboSimpleRendering() ctx.makeCurrent(&window); if (!QOpenGLFramebufferObject::hasOpenGLFramebufferObjects()) - QSKIP("QOpenGLFramebufferObject not supported on this platform", SkipSingle); + QSKIP("QOpenGLFramebufferObject not supported on this platform"); // No multisample with combined depth/stencil attachment: QOpenGLFramebufferObjectFormat fboFormat; @@ -336,7 +336,7 @@ void tst_QOpenGL::fboRendering() ctx.makeCurrent(&window); if (!QOpenGLFramebufferObject::hasOpenGLFramebufferObjects()) - QSKIP("QOpenGLFramebufferObject not supported on this platform", SkipSingle); + QSKIP("QOpenGLFramebufferObject not supported on this platform"); // No multisample with combined depth/stencil attachment: QOpenGLFramebufferObjectFormat fboFormat; @@ -346,7 +346,7 @@ void tst_QOpenGL::fboRendering() QOpenGLFramebufferObject fbo(256, 128, fboFormat); if (fbo.attachment() != QOpenGLFramebufferObject::CombinedDepthStencil) - QSKIP("FBOs missing combined depth~stencil support", SkipSingle); + QSKIP("FBOs missing combined depth~stencil support"); fbo.bind(); @@ -378,9 +378,8 @@ void tst_QOpenGL::fboHandleNulledAfterContextDestroyed() ctx.makeCurrent(&window); - if (!QOpenGLFramebufferObject::hasOpenGLFramebufferObjects()) { - QSKIP("QOpenGLFramebufferObject not supported on this platform", SkipSingle); - } + if (!QOpenGLFramebufferObject::hasOpenGLFramebufferObjects()) + QSKIP("QOpenGLFramebufferObject not supported on this platform"); fbo = new QOpenGLFramebufferObject(128, 128); diff --git a/tests/auto/qwindowsurface/tst_qwindowsurface.cpp b/tests/auto/qwindowsurface/tst_qwindowsurface.cpp index ecb6419a97..e31d1d3cfc 100644 --- a/tests/auto/qwindowsurface/tst_qwindowsurface.cpp +++ b/tests/auto/qwindowsurface/tst_qwindowsurface.cpp @@ -69,7 +69,7 @@ private slots: #if QT_VERSION >= 0x050000 void tst_QWindowSurface::initTestCase() { - QSKIP("This test is temporarily skipped until it is fixed for Qt5", SkipAll); + QSKIP("This test is temporarily skipped until it is fixed for Qt5"); } #else @@ -162,7 +162,7 @@ void tst_QWindowSurface::flushOutsidePaintEvent() { #ifdef Q_WS_X11 if (QX11Info::isCompositingManagerRunning()) - QSKIP("Test is unreliable with composition manager", SkipAll); + QSKIP("Test is unreliable with composition manager"); #endif #ifdef Q_WS_WIN @@ -208,7 +208,7 @@ void tst_QWindowSurface::flushOutsidePaintEvent() QApplication::processEvents(); #if defined(Q_WS_QWS) - QSKIP("task 176755", SkipAll); + QSKIP("task 176755"); #endif VERIFY_COLOR(w.geometry(), w.color); QCOMPARE(QRegion(w.rect()), w.r); diff --git a/tests/auto/qx11info/tst_qx11info.cpp b/tests/auto/qx11info/tst_qx11info.cpp index f94c29065c..6d0476f88e 100644 --- a/tests/auto/qx11info/tst_qx11info.cpp +++ b/tests/auto/qx11info/tst_qx11info.cpp @@ -60,7 +60,7 @@ private slots: #ifndef Q_WS_X11 void tst_QX11Info::initTestCase() { - QSKIP("This test is only valid for X11", SkipAll); + QSKIP("This test is only valid for X11"); } #else diff --git a/tests/auto/sql/kernel/qsql/tst_qsql.cpp b/tests/auto/sql/kernel/qsql/tst_qsql.cpp index 453eb44daa..2cbf30ba74 100644 --- a/tests/auto/sql/kernel/qsql/tst_qsql.cpp +++ b/tests/auto/sql/kernel/qsql/tst_qsql.cpp @@ -220,7 +220,7 @@ void tst_QSql::openErrorRecovery() dbs.addDbs(); if (dbs.dbNames.isEmpty()) - QSKIP("No database drivers installed", SkipAll); + QSKIP("No database drivers installed"); foreach ( const QString& dbName, dbs.dbNames ) { QSqlDatabase db = QSqlDatabase::database( dbName, false ); CHECK_DATABASE( db ); diff --git a/tests/auto/sql/kernel/qsqldatabase/tst_databases.h b/tests/auto/sql/kernel/qsqldatabase/tst_databases.h index 9515d01049..1d72b2bf41 100644 --- a/tests/auto/sql/kernel/qsqldatabase/tst_databases.h +++ b/tests/auto/sql/kernel/qsqldatabase/tst_databases.h @@ -71,7 +71,7 @@ #define QFAIL_SQL(q, stmt) QVERIFY2(!(q).stmt, tst_Databases::printError((q).lastError(), db)) #define DBMS_SPECIFIC(db, driver) \ - if (!db.driverName().startsWith(driver)) { QSKIP(driver " specific test", SkipSingle); } + if (!db.driverName().startsWith(driver)) { QSKIP(driver " specific test"); } // ### use QSystem::hostName if it is integrated in qtest/main static QString qGetHostName() diff --git a/tests/auto/sql/kernel/qsqldatabase/tst_qsqldatabase.cpp b/tests/auto/sql/kernel/qsqldatabase/tst_qsqldatabase.cpp index 26e91c1153..dab9933223 100644 --- a/tests/auto/sql/kernel/qsqldatabase/tst_qsqldatabase.cpp +++ b/tests/auto/sql/kernel/qsqldatabase/tst_qsqldatabase.cpp @@ -421,9 +421,9 @@ void tst_QSqlDatabase::generic_data(const QString& engine) { if ( dbs.fillTestTable(engine) == 0 ) { if(engine.isEmpty()) - QSKIP( "No database drivers are available in this Qt configuration", SkipAll ); + QSKIP( "No database drivers are available in this Qt configuration"); else - QSKIP( (QString("No database drivers of type %1 are available in this Qt configuration").arg(engine)).toLocal8Bit(), SkipAll ); + QSKIP( (QString("No database drivers of type %1 are available in this Qt configuration").arg(engine)).toLocal8Bit()); } } @@ -476,7 +476,7 @@ void tst_QSqlDatabase::tables() QSqlQuery q(db); if ( db.driverName().startsWith( "QMYSQL" ) && tst_Databases::getMySqlVersion( db ).section( QChar('.'), 0, 0 ).toInt()<5 ) - QSKIP( "Test requires MySQL >= 5.0", SkipSingle ); + QSKIP( "Test requires MySQL >= 5.0"); if (!q.exec("CREATE VIEW " + qtest_view + " as select * from " + qtest)) { @@ -553,7 +553,7 @@ void tst_QSqlDatabase::whitespaceInIdentifiers() else QCOMPARE(idx.field(0).type(), QVariant::Int); } else { - QSKIP("DBMS does not support whitespaces in identifiers", SkipSingle); + QSKIP("DBMS does not support whitespaces in identifiers"); } } @@ -576,7 +576,7 @@ void tst_QSqlDatabase::alterTable() } if (!q.exec("alter table " + qtestalter + " drop column F2")) { - QSKIP("DBMS doesn't support dropping columns in ALTER TABLE statement", SkipSingle); + QSKIP("DBMS doesn't support dropping columns in ALTER TABLE statement"); } rec = db.record(qtestalter); @@ -985,7 +985,7 @@ void tst_QSqlDatabase::recordSQLServer() CHECK_DATABASE(db); if (!tst_Databases::isSqlServer(db)) - QSKIP("SQL server specific test", SkipSingle); + QSKIP("SQL server specific test"); // ### TODO: Add the rest of the fields static const FieldDef fieldDefs[] = { @@ -1014,7 +1014,7 @@ void tst_QSqlDatabase::recordAccess() CHECK_DATABASE(db); if (!tst_Databases::isMSAccess(db)) - QSKIP("MS Access specific test", SkipSingle); + QSKIP("MS Access specific test"); QString memo; for (int i = 0; i < 32; i++) @@ -1045,7 +1045,7 @@ void tst_QSqlDatabase::transaction() const QString qtest(qTableName("qtest", __FILE__)); if (!db.driver()->hasFeature(QSqlDriver::Transactions)) - QSKIP("DBMS not transaction capable", SkipSingle); + QSKIP("DBMS not transaction capable"); QVERIFY(db.transaction()); @@ -1073,7 +1073,7 @@ void tst_QSqlDatabase::transaction() q.clear(); // for SQLite which does not allow any references on rows that shall be rolled back if (!db.rollback()) { if (db.driverName().startsWith("QMYSQL")) - QSKIP("MySQL transaction failed: " + tst_Databases::printError(db.lastError()), SkipSingle); + QSKIP("MySQL transaction failed: " + tst_Databases::printError(db.lastError())); else QFAIL("Could not rollback transaction: " + tst_Databases::printError(db.lastError())); } @@ -1110,7 +1110,7 @@ void tst_QSqlDatabase::bigIntField() //} else if (drvName.startsWith("QIBASE")) { // QVERIFY_SQL(q, exec("create table " + qtest_bigint + " (id int, t_s64bit int64, t_u64bit int64)")); } else { - QSKIP("no 64 bit integer support", SkipAll); + QSKIP("no 64 bit integer support"); } QVERIFY(q.prepare("insert into " + qtest_bigint + " values (?, ?, ?)")); qlonglong ll = Q_INT64_C(9223372036854775807); @@ -1205,7 +1205,7 @@ void tst_QSqlDatabase::psql_schemas() CHECK_DATABASE(db); if (!db.tables(QSql::SystemTables).contains("pg_namespace")) - QSKIP("server does not support schemas", SkipSingle); + QSKIP("server does not support schemas"); QSqlQuery q(db); @@ -1238,7 +1238,7 @@ void tst_QSqlDatabase::psql_escapedIdentifiers() CHECK_DATABASE(db); if (!db.tables(QSql::SystemTables).contains("pg_namespace")) - QSKIP("server does not support schemas", SkipSingle); + QSKIP("server does not support schemas"); QSqlQuery q(db); @@ -1315,7 +1315,7 @@ void tst_QSqlDatabase::bug_249059() QString version=tst_Databases::getPSQLVersion( db ); double ver=version.section(QChar::fromLatin1('.'),0,1).toDouble(); if (ver < 7.3) - QSKIP("Test requires PostgreSQL >= 7.3", SkipSingle); + QSKIP("Test requires PostgreSQL >= 7.3"); QSqlQuery q(db); const QString tableName(qTableName("bug_249059", __FILE__)); @@ -1355,7 +1355,7 @@ void tst_QSqlDatabase::precisionPolicy() QSqlQuery q(db); const QString tableName(qTableName("qtest_prec", __FILE__)); if(!db.driver()->hasFeature(QSqlDriver::LowPrecisionNumbers)) - QSKIP("Driver or database doesn't support setting precision policy", SkipSingle); + QSKIP("Driver or database doesn't support setting precision policy"); // Create a test table with some data if(tst_Databases::isMSAccess(db)) @@ -1445,7 +1445,7 @@ void tst_QSqlDatabase::mysqlOdbc_unsignedIntegers() CHECK_DATABASE(db); if (!db.driverName().startsWith("QODBC") || !dbName.toUpper().contains("MYSQL")) - QSKIP("MySQL through ODBC-driver specific test", SkipSingle); + QSKIP("MySQL through ODBC-driver specific test"); QSqlQuery q(db); const QString tableName(qTableName("uint", __FILE__)); @@ -1469,7 +1469,7 @@ void tst_QSqlDatabase::accessOdbc_strings() CHECK_DATABASE(db); if (!tst_Databases::isMSAccess(db)) - QSKIP("MS Access specific test", SkipSingle); + QSKIP("MS Access specific test"); QSqlQuery q(db); const QString tableName(qTableName("strings", __FILE__)); @@ -1629,7 +1629,7 @@ void tst_QSqlDatabase::ibase_procWithReturnValues() CHECK_DATABASE(db); if (!db.driverName().startsWith("QIBASE")) - QSKIP("InterBase specific test", SkipSingle); + QSKIP("InterBase specific test"); const QString procName(qTableName("qtest_proc2", __FILE__)); @@ -1716,7 +1716,7 @@ void tst_QSqlDatabase::odbc_bindBoolean() CHECK_DATABASE(db); if (tst_Databases::isMySQL(db)) - QSKIP("MySql has inconsistent behaviour of bit field type across versions.", SkipSingle); + QSKIP("MySql has inconsistent behaviour of bit field type across versions."); QSqlQuery q(db); QVERIFY_SQL(q, exec("CREATE TABLE " + qTableName("qtestBindBool", __FILE__) + "(id int, boolvalue bit)")); @@ -1795,7 +1795,7 @@ void tst_QSqlDatabase::mysql_multiselect() QString version=tst_Databases::getMySqlVersion( db ); double ver=version.section(QChar::fromLatin1('.'),0,1).toDouble(); if (ver < 4.1) - QSKIP("Test requires MySQL >= 4.1", SkipSingle); + QSKIP("Test requires MySQL >= 4.1"); QVERIFY_SQL(q, exec("SELECT * FROM " + qtest + "; SELECT * FROM " + qtest)); QVERIFY_SQL(q, next()); @@ -1859,7 +1859,7 @@ void tst_QSqlDatabase::oci_xmltypeSupport() // Embedding the XML in the statement if(!q.exec(QString("CREATE TABLE %1(xmldata xmltype)").arg(tableName))) - QSKIP("This test requries xml type support", SkipSingle); + QSKIP("This test requries xml type support"); QVERIFY_SQL(q, exec(QString("INSERT INTO %1 values('%2')").arg(tableName).arg(xml))); QVERIFY_SQL(q, exec(QString("SELECT a.xmldata.getStringVal() FROM %1 a").arg(tableName))); QVERIFY_SQL(q, last()); @@ -1928,7 +1928,7 @@ void tst_QSqlDatabase::odbc_uniqueidentifier() QSqlDatabase db = QSqlDatabase::database(dbName); CHECK_DATABASE(db); if (!tst_Databases::isSqlServer(db)) - QSKIP("SQL Server (ODBC) specific test", SkipSingle); + QSKIP("SQL Server (ODBC) specific test"); const QString tableName(qTableName("qtest_sqlguid", __FILE__)); QString guid = QString("AAAAAAAA-BBBB-CCCC-DDDD-EEEEEEEEEEEE"); @@ -1998,7 +1998,7 @@ void tst_QSqlDatabase::eventNotification() QSqlDriver *driver = db.driver(); if (!driver->hasFeature(QSqlDriver::EventNotifications)) - QSKIP("DBMS doesn't support event notifications", SkipSingle); + QSKIP("DBMS doesn't support event notifications"); // Not subscribed to any events yet QCOMPARE(driver->subscribedToNotifications().size(), 0); @@ -2067,7 +2067,7 @@ void tst_QSqlDatabase::eventNotificationPSQL() CHECK_DATABASE(db); #if defined(Q_OS_LINUX) - QSKIP( "Event support doesn't work on linux", SkipAll ); + QSKIP( "Event support doesn't work on linux"); #endif QSqlQuery query(db); @@ -2090,7 +2090,7 @@ void tst_QSqlDatabase::sqlite_bindAndFetchUInt() QSqlDatabase db = QSqlDatabase::database(dbName); CHECK_DATABASE(db); if (db.driverName().startsWith("QSQLITE2")) - QSKIP("SQLite3 specific test", SkipSingle); + QSKIP("SQLite3 specific test"); QSqlQuery q(db); const QString tableName(qTableName("uint_test", __FILE__)); @@ -2155,7 +2155,7 @@ void tst_QSqlDatabase::mysql_savepointtest() QSqlDatabase db = QSqlDatabase::database(dbName); CHECK_DATABASE(db); if ( db.driverName().startsWith( "QMYSQL" ) && tst_Databases::getMySqlVersion( db ).section( QChar('.'), 0, 1 ).toDouble()<4.1 ) - QSKIP( "Test requires MySQL >= 4.1", SkipSingle ); + QSKIP( "Test requires MySQL >= 4.1"); QSqlQuery q(db); QVERIFY_SQL(q, exec("begin")); @@ -2179,7 +2179,7 @@ void tst_QSqlDatabase::sqlite_enable_cache_mode() { QFETCH(QString, dbName); if(dbName.endsWith(":memory:")) - QSKIP( "cache mode is meaningless for :memory: databases", SkipSingle ); + QSKIP( "cache mode is meaningless for :memory: databases"); QSqlDatabase db = QSqlDatabase::database(dbName); CHECK_DATABASE(db); db.close(); diff --git a/tests/auto/sql/kernel/qsqldriver/tst_qsqldriver.cpp b/tests/auto/sql/kernel/qsqldriver/tst_qsqldriver.cpp index bb77eebd1b..7d622dbd56 100644 --- a/tests/auto/sql/kernel/qsqldriver/tst_qsqldriver.cpp +++ b/tests/auto/sql/kernel/qsqldriver/tst_qsqldriver.cpp @@ -76,7 +76,7 @@ void tst_QSqlDriver::initTestCase_data() { dbs.open(); if (dbs.fillTestTable() == 0) - QSKIP("No database drivers are available in this Qt configuration", SkipAll); + QSKIP("No database drivers are available in this Qt configuration"); } void tst_QSqlDriver::recreateTestTables(QSqlDatabase db) diff --git a/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp b/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp index 5546cefd09..c2c66a5642 100644 --- a/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp +++ b/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp @@ -294,9 +294,9 @@ void tst_QSqlQuery::generic_data(const QString& engine) { if ( dbs.fillTestTable(engine) == 0 ) { if(engine.isEmpty()) - QSKIP( "No database drivers are available in this Qt configuration", SkipAll ); + QSKIP( "No database drivers are available in this Qt configuration"); else - QSKIP( (QString("No database drivers of type %1 are available in this Qt configuration").arg(engine)).toLocal8Bit(), SkipAll ); + QSKIP( (QString("No database drivers of type %1 are available in this Qt configuration").arg(engine)).toLocal8Bit()); } } @@ -428,14 +428,14 @@ void tst_QSqlQuery::char1SelectUnicode() CHECK_DATABASE( db ); if(db.driverName().startsWith("QDB2")) - QSKIP("Needs someone with more Unicode knowledge than I have to fix", SkipSingle); + QSKIP("Needs someone with more Unicode knowledge than I have to fix"); if ( db.driver()->hasFeature( QSqlDriver::Unicode ) ) { QString uniStr( QChar(0x0915) ); // DEVANAGARI LETTER KA QSqlQuery q( db ); if ( db.driverName().startsWith( "QMYSQL" ) && tst_Databases::getMySqlVersion( db ).section( QChar('.'), 0, 0 ).toInt()<5 ) - QSKIP( "Test requires MySQL >= 5.0", SkipSingle ); + QSKIP( "Test requires MySQL >= 5.0"); QString createQuery; const QString char1SelectUnicode(qTableName( "char1SU", __FILE__ )); @@ -475,7 +475,7 @@ void tst_QSqlQuery::char1SelectUnicode() QVERIFY( !q.next() ); } else - QSKIP( "Database not unicode capable", SkipSingle ); + QSKIP( "Database not unicode capable"); } void tst_QSqlQuery::oraRowId() @@ -523,7 +523,7 @@ void tst_QSqlQuery::mysqlOutValues() QSqlQuery q( db ); if ( db.driverName().startsWith( "QMYSQL" ) && tst_Databases::getMySqlVersion( db ).section( QChar('.'), 0, 0 ).toInt()<5 ) - QSKIP( "Test requires MySQL >= 5.0", SkipSingle ); + QSKIP( "Test requires MySQL >= 5.0"); q.exec( "drop function " + hello ); @@ -572,7 +572,7 @@ void tst_QSqlQuery::oraOutValues() const QString tst_outValues(qTableName("tst_outValues", __FILE__)); if ( !db.driver()->hasFeature( QSqlDriver::PreparedQueries ) ) - QSKIP( "Test requires prepared query support", SkipSingle ); + QSKIP( "Test requires prepared query support"); QSqlQuery q( db ); @@ -754,7 +754,7 @@ void tst_QSqlQuery::outValuesDB2() CHECK_DATABASE( db ); if ( !db.driver()->hasFeature( QSqlDriver::PreparedQueries ) ) - QSKIP( "Test requires prepared query support", SkipSingle ); + QSKIP( "Test requires prepared query support"); QSqlQuery q( db ); @@ -791,7 +791,7 @@ void tst_QSqlQuery::outValues() const QString tst_outValues(qTableName("tst_outValues", __FILE__)); if ( !db.driver()->hasFeature( QSqlDriver::PreparedQueries ) ) - QSKIP( "Test requires prepared query support", SkipSingle ); + QSKIP( "Test requires prepared query support"); QSqlQuery q( db ); @@ -819,7 +819,7 @@ void tst_QSqlQuery::outValues() "end\n" ) ); QVERIFY( q.prepare( "{call " + tst_outValues + "(?)}" ) ); } else - QSKIP( "Don't know how to create a stored procedure for this database server, please fix this test", SkipSingle ); + QSKIP( "Don't know how to create a stored procedure for this database server, please fix this test"); q.addBindValue( 0, QSql::Out ); @@ -838,7 +838,7 @@ void tst_QSqlQuery::blob() CHECK_DATABASE( db ); if ( !db.driver()->hasFeature( QSqlDriver::BLOB ) ) - QSKIP( "DBMS not BLOB capable", SkipSingle ); + QSKIP( "DBMS not BLOB capable"); //don' make it too big otherwise sybase and mysql will complain QByteArray ba( BLOBSIZE, 0 ); @@ -994,7 +994,7 @@ void tst_QSqlQuery::numRowsAffected() ++i; if ( q.numRowsAffected() == -1 || q.numRowsAffected() == 0 ) - QSKIP("Database doesn't support numRowsAffected", SkipSingle); + QSKIP("Database doesn't support numRowsAffected"); if ( q.numRowsAffected() != -1 && q.numRowsAffected() != 0 && q.numRowsAffected() != i ) { // the value is undefined for SELECT, this check is just here for curiosity @@ -1346,7 +1346,7 @@ void tst_QSqlQuery::bitField() CHECK_DATABASE( db ); if ( !db.driverName().startsWith( "QTDS" ) ) - QSKIP( "TDS specific test", SkipSingle ); + QSKIP( "TDS specific test"); QSqlQuery q( db ); @@ -1434,7 +1434,7 @@ void tst_QSqlQuery::precision() static const char* precStr = "1.2345678901234567891"; if ( db.driverName().startsWith( "QIBASE" ) ) - QSKIP( "DB unable to store high precision", SkipSingle ); + QSKIP( "DB unable to store high precision"); { // need a new scope for SQLITE @@ -1499,14 +1499,14 @@ void tst_QSqlQuery::nullResult() void tst_QSqlQuery::transaction() { // query based transaction is not really possible with Qt - QSKIP( "only tested manually by trained staff", SkipAll ); + QSKIP( "only tested manually by trained staff"); QFETCH( QString, dbName ); QSqlDatabase db = QSqlDatabase::database( dbName ); CHECK_DATABASE( db ); if ( !db.driver()->hasFeature( QSqlDriver::Transactions ) ) - QSKIP( "DBMS not transaction capable", SkipSingle ); + QSKIP( "DBMS not transaction capable"); // this is the standard SQL QString startTransactionStr( "start transaction" ); @@ -1551,7 +1551,7 @@ void tst_QSqlQuery::transaction() if ( !q.exec( "rollback" ) ) { if ( db.driverName().startsWith( "QMYSQL" ) ) { qDebug( "MySQL: %s", qPrintable(tst_Databases::printError( q.lastError() ) )); - QSKIP( "MySQL transaction failed ", SkipSingle ); //non-fatal + QSKIP( "MySQL transaction failed "); //non-fatal } else QFAIL( "Could not rollback transaction: " + tst_Databases::printError( q.lastError() ) ); } @@ -1595,7 +1595,7 @@ void tst_QSqlQuery::joins() || db.driverName().startsWith( "QIBASE" ) ) // Oracle broken beyond recognition - cannot outer join on more than // one table. - QSKIP( "DBMS cannot understand standard SQL", SkipSingle ); + QSKIP( "DBMS cannot understand standard SQL"); QSqlQuery q( db ); @@ -1657,9 +1657,9 @@ void tst_QSqlQuery::prepare_bind_exec() const QString qtest_prepare(qTableName("qtest_prepare", __FILE__)); if(db.driverName().startsWith("QIBASE") && (db.databaseName() == "silence.nokia.troll.no:c:\\ibase\\testdb_ascii" || db.databaseName() == "/opt/interbase/qttest.gdb")) - QSKIP("Can't transliterate extended unicode to ascii", SkipSingle); + QSKIP("Can't transliterate extended unicode to ascii"); if(db.driverName().startsWith("QDB2")) - QSKIP("Needs someone with more Unicode knowledge than I have to fix", SkipSingle); + QSKIP("Needs someone with more Unicode knowledge than I have to fix"); { // new scope for SQLITE @@ -1878,7 +1878,7 @@ void tst_QSqlQuery::sqlServerLongStrings() CHECK_DATABASE( db ); if ( !tst_Databases::isSqlServer( db ) ) - QSKIP( "SQL Server specific test", SkipSingle ); + QSKIP( "SQL Server specific test"); QSqlQuery q( db ); @@ -1963,7 +1963,7 @@ void tst_QSqlQuery::batchExec() CHECK_DATABASE( db ); if ( !db.driver()->hasFeature( QSqlDriver::BatchOperations ) ) - QSKIP( "Database can't do BatchOperations", SkipSingle ); + QSKIP( "Database can't do BatchOperations"); QSqlQuery q( db ); const QString tableName = qTableName( "qtest_batch", __FILE__ ); @@ -2018,7 +2018,7 @@ void tst_QSqlQuery::oraArrayBind() CHECK_DATABASE( db ); if ( !db.driver()->hasFeature( QSqlDriver::BatchOperations ) ) - QSKIP( "Database can't do BatchOperations", SkipSingle ); + QSKIP( "Database can't do BatchOperations"); QSqlQuery q( db ); @@ -2180,7 +2180,7 @@ void tst_QSqlQuery::lastInsertId() CHECK_DATABASE( db ); if ( !db.driver()->hasFeature( QSqlDriver::LastInsertId ) ) - QSKIP( "Database doesn't support lastInsertId", SkipSingle ); + QSKIP( "Database doesn't support lastInsertId"); QSqlQuery q( db ); @@ -2213,7 +2213,7 @@ void tst_QSqlQuery::bindWithDoubleColonCastOperator() // Only PostgreSQL support the double-colon cast operator if ( !db.driverName().startsWith( "QPSQL" ) ) - QSKIP( "Test requires PostgreSQL", SkipSingle ); + QSKIP( "Test requires PostgreSQL"); const QString tablename(qTableName( "bindtest", __FILE__ )); @@ -2281,7 +2281,7 @@ void tst_QSqlQuery::createQueryOnClosedDatabase() && !db.driverName().startsWith( "QOCI" ) && !db.driverName().startsWith( "QMYSQL" ) && !db.driverName().startsWith( "QDB2" ) ) - QSKIP( "Test is specific for PostgreSQL, Oracle, MySql and DB2", SkipSingle ); + QSKIP( "Test is specific for PostgreSQL, Oracle, MySql and DB2"); db.close(); @@ -2367,10 +2367,10 @@ void tst_QSqlQuery::sqlite_finish() QSqlDatabase db = QSqlDatabase::database( dbName ); CHECK_DATABASE( db ); if (db.driverName() != QLatin1String("QSQLITE")) - QSKIP("Sqlite3 specific test", SkipSingle); + QSKIP("Sqlite3 specific test"); if ( db.databaseName().startsWith( ':' ) ) - QSKIP( "This test requires a database on the filesystem, not in-memory", SkipAll ); + QSKIP( "This test requires a database on the filesystem, not in-memory"); { QSqlDatabase db2 = QSqlDatabase::addDatabase( "QSQLITE", "sqlite_finish_sqlite" ); @@ -2412,12 +2412,12 @@ void tst_QSqlQuery::nextResult() CHECK_DATABASE( db ); if ( !db.driver()->hasFeature( QSqlDriver::MultipleResultSets ) || !db.driver()->hasFeature( QSqlDriver::BatchOperations ) ) - QSKIP( "DBMS does not support multiple result sets or batch operations", SkipSingle ); + QSKIP( "DBMS does not support multiple result sets or batch operations"); QSqlQuery q( db ); if ( db.driverName().startsWith( "QMYSQL" ) && tst_Databases::getMySqlVersion( db ).section( QChar('.'), 0, 0 ).toInt()<5 ) - QSKIP( "Test requires MySQL >= 5.0", SkipSingle ); + QSKIP( "Test requires MySQL >= 5.0"); enum DriverType { ODBC, MYSQL, DB2 }; DriverType driverType = ODBC; @@ -2607,7 +2607,7 @@ void tst_QSqlQuery::blobsPreparedQuery() CHECK_DATABASE( db ); if ( !db.driver()->hasFeature( QSqlDriver::BLOB ) || !db.driver()->hasFeature( QSqlDriver::PreparedQueries ) ) - QSKIP( "DBMS does not support BLOBs or prepared queries", SkipSingle ); + QSKIP( "DBMS does not support BLOBs or prepared queries"); const QString tableName(qTableName( "blobstest", __FILE__ )); @@ -2712,7 +2712,7 @@ void tst_QSqlQuery::task_250026() if ( !q.exec( "create table " + tableName + " (longfield varchar(1100))" ) ) { qDebug() << "Error" << q.lastError(); - QSKIP( "Db doesn't support \"1100\" as a size for fields", SkipSingle ); + QSKIP( "Db doesn't support \"1100\" as a size for fields"); } data258.fill( 'A', 258 ); @@ -2853,7 +2853,7 @@ void tst_QSqlQuery::sqlServerReturn0() QSqlDatabase db = QSqlDatabase::database( dbName ); CHECK_DATABASE( db ); if (!tst_Databases::isSqlServer( db )) - QSKIP("SQL Server specific test", SkipSingle); + QSKIP("SQL Server specific test"); const QString tableName(qTableName("test141895", __FILE__)), procName(qTableName("test141895_proc", __FILE__)); QSqlQuery q( db ); @@ -3001,7 +3001,7 @@ void tst_QSqlQuery::QTBUG_6618() QSqlDatabase db = QSqlDatabase::database( dbName ); CHECK_DATABASE( db ); if (!tst_Databases::isSqlServer( db )) - QSKIP("SQL Server specific test", SkipSingle); + QSKIP("SQL Server specific test"); QSqlQuery q(db); q.exec( "drop procedure " + qTableName( "tst_raiseError", __FILE__ ) ); //non-fatal @@ -3023,7 +3023,7 @@ void tst_QSqlQuery::QTBUG_6852() QSqlDatabase db = QSqlDatabase::database( dbName ); CHECK_DATABASE( db ); if ( tst_Databases::getMySqlVersion( db ).section( QChar('.'), 0, 0 ).toInt()<5 ) - QSKIP( "Test requires MySQL >= 5.0", SkipSingle ); + QSKIP( "Test requires MySQL >= 5.0"); QSqlQuery q(db); const QString tableName(qTableName("bug6852", __FILE__)), procName(qTableName("bug6852_proc", __FILE__)); @@ -3057,7 +3057,7 @@ void tst_QSqlQuery::QTBUG_5765() QSqlDatabase db = QSqlDatabase::database( dbName ); CHECK_DATABASE( db ); if ( tst_Databases::getMySqlVersion( db ).section( QChar('.'), 0, 1 ).toFloat()<4.1 ) - QSKIP( "Test requires MySQL >= 4.1", SkipSingle ); + QSKIP( "Test requires MySQL >= 4.1"); QSqlQuery q(db); const QString tableName(qTableName("bug5765", __FILE__)); @@ -3199,7 +3199,7 @@ void tst_QSqlQuery::sqlite_constraint() CHECK_DATABASE( db ); if (db.driverName() != QLatin1String("QSQLITE")) - QSKIP("Sqlite3 specific test", SkipSingle); + QSKIP("Sqlite3 specific test"); QSqlQuery q(db); const QString trigger(qTableName("test_constraint", __FILE__)); @@ -3222,7 +3222,7 @@ void tst_QSqlQuery::benchmark() QSqlDatabase db = QSqlDatabase::database( dbName ); CHECK_DATABASE( db ); if ( tst_Databases::getMySqlVersion( db ).section( QChar('.'), 0, 0 ).toInt()<5 ) - QSKIP( "Test requires MySQL >= 5.0", SkipSingle ); + QSKIP( "Test requires MySQL >= 5.0"); QSqlQuery q(db); const QString tableName(qTableName("benchmark", __FILE__)); diff --git a/tests/auto/sql/kernel/qsqlthread/tst_qsqlthread.cpp b/tests/auto/sql/kernel/qsqlthread/tst_qsqlthread.cpp index 79ebc93a80..f14b3d4e93 100644 --- a/tests/auto/sql/kernel/qsqlthread/tst_qsqlthread.cpp +++ b/tests/auto/sql/kernel/qsqlthread/tst_qsqlthread.cpp @@ -291,9 +291,9 @@ void tst_QSqlThread::generic_data(const QString& engine) { if ( dbs.fillTestTable(engine) == 0 ) { if(engine.isEmpty()) - QSKIP( "No database drivers are available in this Qt configuration", SkipAll ); + QSKIP( "No database drivers are available in this Qt configuration"); else - QSKIP( (QString("No database drivers of type %1 are available in this Qt configuration").arg(engine)).toLocal8Bit(), SkipAll ); + QSKIP( (QString("No database drivers of type %1 are available in this Qt configuration").arg(engine)).toLocal8Bit()); } } @@ -380,7 +380,7 @@ void tst_QSqlThread::simpleThreading() CHECK_DATABASE(db); if (db.databaseName() == ":memory:") - QSKIP("does not work with in-memory databases", SkipSingle); + QSKIP("does not work with in-memory databases"); QtTestSqlThread t1(db); QtTestSqlThread t2(db); @@ -404,9 +404,9 @@ void tst_QSqlThread::readWriteThreading() CHECK_DATABASE(db); if (db.databaseName() == ":memory:") - QSKIP("does not work with in-memory databases", SkipSingle); + QSKIP("does not work with in-memory databases"); else if (tst_Databases::isMSAccess(db)) - QSKIP("does not work with MS Access databases", SkipSingle); + QSKIP("does not work with MS Access databases"); SqlProducer producer(db); SqlConsumer consumer(db); @@ -432,7 +432,7 @@ void tst_QSqlThread::readFromSingleConnection() CHECK_DATABASE(db); if (db.databaseName() == ":memory:") - QSKIP("does not work with in-memory databases", SkipSingle); + QSKIP("does not work with in-memory databases"); QObject cleanupHelper; // make sure the threads die when we exit the scope for (int i = 0; i < maxThreadCount; ++i) { @@ -454,7 +454,7 @@ void tst_QSqlThread::readWriteFromSingleConnection() CHECK_DATABASE(db); if (db.databaseName() == ":memory:") - QSKIP("does not work with in-memory databases", SkipSingle); + QSKIP("does not work with in-memory databases"); QObject cleanupHelper; for (int i = 0; i < maxThreadCount; ++i) { @@ -480,7 +480,7 @@ void tst_QSqlThread::preparedReadWriteFromSingleConnection() CHECK_DATABASE(db); if (db.databaseName() == ":memory:") - QSKIP("does not work with in-memory databases", SkipSingle); + QSKIP("does not work with in-memory databases"); QObject cleanupHelper; for (int i = 0; i < maxThreadCount; ++i) { @@ -506,7 +506,7 @@ void tst_QSqlThread::transactionsFromSingleConnection() CHECK_DATABASE(db); if (db.databaseName() == ":memory:") - QSKIP("does not work with in-memory databases", SkipSingle); + QSKIP("does not work with in-memory databases"); // start and commit a transaction QVERIFY_SQL(db, db.transaction()); diff --git a/tests/auto/sql/models/qsqlquerymodel/tst_qsqlquerymodel.cpp b/tests/auto/sql/models/qsqlquerymodel/tst_qsqlquerymodel.cpp index 25fc893c77..0eebe76049 100644 --- a/tests/auto/sql/models/qsqlquerymodel/tst_qsqlquerymodel.cpp +++ b/tests/auto/sql/models/qsqlquerymodel/tst_qsqlquerymodel.cpp @@ -213,9 +213,9 @@ void tst_QSqlQueryModel::generic_data(const QString& engine) { if ( dbs.fillTestTable(engine) == 0 ) { if(engine.isEmpty()) - QSKIP( "No database drivers are available in this Qt configuration", SkipAll ); + QSKIP( "No database drivers are available in this Qt configuration"); else - QSKIP( (QString("No database drivers of type %1 are available in this Qt configuration").arg(engine)).toLocal8Bit(), SkipAll ); + QSKIP( (QString("No database drivers of type %1 are available in this Qt configuration").arg(engine)).toLocal8Bit()); } } @@ -512,7 +512,7 @@ void tst_QSqlQueryModel::withSortFilterProxyModel() CHECK_DATABASE(db); if (db.driver()->hasFeature(QSqlDriver::QuerySize)) - QSKIP("Test applies only for drivers not reporting the query size.", SkipSingle); + QSKIP("Test applies only for drivers not reporting the query size."); QSqlQueryModel model; model.setQuery(QSqlQuery("SELECT * FROM " + qTableName("test3", __FILE__), db)); diff --git a/tests/auto/sql/models/qsqlrelationaltablemodel/tst_qsqlrelationaltablemodel.cpp b/tests/auto/sql/models/qsqlrelationaltablemodel/tst_qsqlrelationaltablemodel.cpp index 5bfff0dc32..ad94da8e5d 100644 --- a/tests/auto/sql/models/qsqlrelationaltablemodel/tst_qsqlrelationaltablemodel.cpp +++ b/tests/auto/sql/models/qsqlrelationaltablemodel/tst_qsqlrelationaltablemodel.cpp @@ -103,7 +103,7 @@ void tst_QSqlRelationalTableModel::initTestCase_data() { dbs.open(); if (dbs.fillTestTable() == 0) - QSKIP("No database drivers are available in this Qt configuration", SkipAll); + QSKIP("No database drivers are available in this Qt configuration"); } void tst_QSqlRelationalTableModel::recreateTestTables(QSqlDatabase db) @@ -1086,7 +1086,7 @@ void tst_QSqlRelationalTableModel::casing() CHECK_DATABASE(db); if (db.driverName().startsWith("QSQLITE") || db.driverName().startsWith("QIBASE") || tst_Databases::isSqlServer(db)) - QSKIP("The casing test for this database is irrelevant since this database does not treat different cases as separate entities", SkipAll); + QSKIP("The casing test for this database is irrelevant since this database does not treat different cases as separate entities"); QSqlQuery q(db); QVERIFY_SQL( q, exec("create table " + qTableName("CASETEST1", db.driver()).toUpper() + @@ -1094,7 +1094,7 @@ void tst_QSqlRelationalTableModel::casing() if( !q.exec("create table " + qTableName("casetest1", db.driver()) + " (ident int not null primary key, name varchar(20), title_key int)")) - QSKIP("The casing test for this database is irrelevant since this database does not treat different cases as separate entities", SkipAll); + QSKIP("The casing test for this database is irrelevant since this database does not treat different cases as separate entities"); QVERIFY_SQL( q, exec("insert into " + qTableName("CASETEST1", db.driver()).toUpper() + " values(1, 'harry', 1, 2)")); QVERIFY_SQL( q, exec("insert into " + qTableName("CASETEST1", db.driver()).toUpper() + " values(2, 'trond', 2, 1)")); @@ -1364,7 +1364,7 @@ void tst_QSqlRelationalTableModel::whiteSpaceInIdentifiers() CHECK_DATABASE(db); if (!testWhiteSpaceNames(db.driverName())) - QSKIP("White space test irrelevant for driver", SkipAll); + QSKIP("White space test irrelevant for driver"); QSqlRelationalTableModel model(0, db); model.setTable(db.driver()->escapeIdentifier(qTableName("rel", __FILE__)+" test6", QSqlDriver::TableName)); model.setSort(0, Qt::DescendingOrder); @@ -1448,7 +1448,7 @@ void tst_QSqlRelationalTableModel::psqlSchemaTest() CHECK_DATABASE(db); if(!tst_Databases::isPostgreSQL(db)) - QSKIP("Postgresql specific test", SkipSingle); + QSKIP("Postgresql specific test"); QSqlRelationalTableModel model(0, db); QSqlQuery q(db); diff --git a/tests/auto/sql/models/qsqltablemodel/tst_qsqltablemodel.cpp b/tests/auto/sql/models/qsqltablemodel/tst_qsqltablemodel.cpp index 07efd4a3a1..a75a6d459a 100644 --- a/tests/auto/sql/models/qsqltablemodel/tst_qsqltablemodel.cpp +++ b/tests/auto/sql/models/qsqltablemodel/tst_qsqltablemodel.cpp @@ -233,9 +233,9 @@ void tst_QSqlTableModel::generic_data(const QString &engine) { if ( dbs.fillTestTable(engine) == 0 ) { if (engine.isEmpty()) - QSKIP( "No database drivers are available in this Qt configuration", SkipAll ); + QSKIP( "No database drivers are available in this Qt configuration"); else - QSKIP( (QString("No database drivers of type %1 are available in this Qt configuration").arg(engine)).toLocal8Bit(), SkipAll ); + QSKIP( (QString("No database drivers of type %1 are available in this Qt configuration").arg(engine)).toLocal8Bit()); } } @@ -243,9 +243,9 @@ void tst_QSqlTableModel::generic_data_with_strategies(const QString &engine) { if ( dbs.fillTestTableWithStrategies(engine) == 0 ) { if (engine.isEmpty()) - QSKIP( "No database drivers are available in this Qt configuration", SkipAll ); + QSKIP( "No database drivers are available in this Qt configuration"); else - QSKIP( (QString("No database drivers of type %1 are available in this Qt configuration").arg(engine)).toLocal8Bit(), SkipAll ); + QSKIP( (QString("No database drivers of type %1 are available in this Qt configuration").arg(engine)).toLocal8Bit()); } } @@ -961,7 +961,7 @@ void tst_QSqlTableModel::whitespaceInIdentifiers() CHECK_DATABASE(db); if (!testWhiteSpaceNames(db.driverName())) - QSKIP("DBMS doesn't support whitespaces in identifiers", SkipSingle); + QSKIP("DBMS doesn't support whitespaces in identifiers"); QString tableName = qTableName("qtestw hitespace", db.driver()); @@ -1221,7 +1221,7 @@ void tst_QSqlTableModel::sqlite_attachedDatabase() QSqlDatabase db = QSqlDatabase::database(dbName); CHECK_DATABASE(db); if(db.databaseName() == ":memory:") - QSKIP(":memory: database, skipping test", SkipSingle); + QSKIP(":memory: database, skipping test"); QSqlDatabase attachedDb = QSqlDatabase::cloneDatabase(db, db.driverName() + QLatin1String("attached")); attachedDb.setDatabaseName(db.databaseName()+QLatin1String("attached.dat")); diff --git a/tests/auto/tools/uic/tst_uic.cpp b/tests/auto/tools/uic/tst_uic.cpp index 45581e4400..2d77cb3c75 100644 --- a/tests/auto/tools/uic/tst_uic.cpp +++ b/tests/auto/tools/uic/tst_uic.cpp @@ -110,7 +110,7 @@ void tst_uic::initTestCase() void tst_uic::run() { if (!uicExists) - QSKIP("uic not found in the path...", SkipAll); + QSKIP("uic not found in the path..."); QFETCH(QString, originalFile); QFETCH(QString, generatedFile); diff --git a/tests/auto/widgets/dialogs/qabstractprintdialog/tst_qabstractprintdialog.cpp b/tests/auto/widgets/dialogs/qabstractprintdialog/tst_qabstractprintdialog.cpp index 5d6165d174..5973dabb99 100644 --- a/tests/auto/widgets/dialogs/qabstractprintdialog/tst_qabstractprintdialog.cpp +++ b/tests/auto/widgets/dialogs/qabstractprintdialog/tst_qabstractprintdialog.cpp @@ -68,7 +68,7 @@ private slots: #if defined(QT_NO_PRINTER) || defined(QT_NO_PRINTDIALOG) void tst_QAbstractPrintDialog::initTestCase() { - QSKIP("This test requires printing and print dialog support", SkipAll); + QSKIP("This test requires printing and print dialog support"); } #else diff --git a/tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp b/tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp index 0f4acdcc9e..78458d4531 100644 --- a/tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp +++ b/tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp @@ -458,8 +458,7 @@ void tst_QDialog::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/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp b/tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp index a2d18eb847..056d748c93 100644 --- a/tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp +++ b/tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp @@ -565,7 +565,7 @@ void tst_QFileDialog2::completionOnLevelAfterRoot() fd.setDirectory("/"); QDir etc("/etc"); if (!etc.exists()) - QSKIP("This test requires to have an etc directory under /", SkipAll); + QSKIP("This test requires to have an etc directory under /"); #endif fd.show(); QLineEdit *edit = qFindChild<QLineEdit*>(&fd, "fileNameEdit"); diff --git a/tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp b/tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp index 26fa58e649..9c587ea1f5 100644 --- a/tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp +++ b/tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp @@ -450,7 +450,7 @@ void tst_QFileSystemModel::rowsInserted_data() void tst_QFileSystemModel::rowsInserted() { #if defined(Q_OS_WINCE) - QSKIP("Watching directories does not work on CE(see #137910)", SkipAll); + QSKIP("Watching directories does not work on CE(see #137910)"); #endif QString tmp = flatDirTestPath; rowCount(); @@ -505,7 +505,7 @@ void tst_QFileSystemModel::rowsRemoved_data() void tst_QFileSystemModel::rowsRemoved() { #if defined(Q_OS_WINCE) - QSKIP("Watching directories does not work on CE(see #137910)", SkipAll); + QSKIP("Watching directories does not work on CE(see #137910)"); #endif QString tmp = flatDirTestPath; rowCount(); diff --git a/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp b/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp index 2e05eb5bab..107ddd53aa 100644 --- a/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp +++ b/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp @@ -989,7 +989,7 @@ void tst_QWizard::setOption_IndependentPages() void tst_QWizard::setOption_IgnoreSubTitles() { #if defined(Q_OS_WINCE) - QSKIP("Skipped because of limited resources and potential crash. (Task: 166824)", SkipAll); + QSKIP("Skipped because of limited resources and potential crash. (Task: 166824)"); #endif QWizard wizard1; wizard1.setButtonLayout(QList<QWizard::WizardButton>() << QWizard::CancelButton); @@ -1087,7 +1087,7 @@ void tst_QWizard::setOption_IgnoreSubTitles() void tst_QWizard::setOption_ExtendedWatermarkPixmap() { #if defined(Q_OS_WINCE) - QSKIP("Skipped because of limited resources and potential crash. (Task: 166824)", SkipAll); + QSKIP("Skipped because of limited resources and potential crash. (Task: 166824)"); #endif QPixmap watermarkPixmap(200, 400); watermarkPixmap.fill(Qt::black); diff --git a/tests/auto/widgets/effects/qgraphicseffect/tst_qgraphicseffect.cpp b/tests/auto/widgets/effects/qgraphicseffect/tst_qgraphicseffect.cpp index 2d9d87a2c5..0bc85bffdc 100644 --- a/tests/auto/widgets/effects/qgraphicseffect/tst_qgraphicseffect.cpp +++ b/tests/auto/widgets/effects/qgraphicseffect/tst_qgraphicseffect.cpp @@ -423,7 +423,7 @@ void tst_QGraphicsEffect::opacity() void tst_QGraphicsEffect::grayscale() { if (qApp->desktop()->depth() < 24) - QSKIP("Test only works on 32 bit displays", SkipAll); + QSKIP("Test only works on 32 bit displays"); QGraphicsScene scene(0, 0, 100, 100); @@ -470,7 +470,7 @@ void tst_QGraphicsEffect::grayscale() void tst_QGraphicsEffect::colorize() { if (qApp->desktop()->depth() < 24) - QSKIP("Test only works on 32 bit displays", SkipAll); + QSKIP("Test only works on 32 bit displays"); QGraphicsScene scene(0, 0, 100, 100); diff --git a/tests/auto/widgets/graphicsview/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp b/tests/auto/widgets/graphicsview/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp index 5dbe501ea8..6bf2f0b733 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp @@ -1675,9 +1675,8 @@ void tst_QGraphicsAnchorLayout::floatConflict() void tst_QGraphicsAnchorLayout::infiniteMaxSizes() { - if (sizeof(qreal) <= 4) { - QSKIP("qreal has too little precision, result will be wrong", SkipAll); - } + if (sizeof(qreal) <= 4) + QSKIP("qreal has too little precision, result will be wrong"); QGraphicsAnchorLayout *l = new QGraphicsAnchorLayout; l->setContentsMargins(0, 0, 0, 0); l->setSpacing(0); diff --git a/tests/auto/widgets/graphicsview/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp b/tests/auto/widgets/graphicsview/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp index e9d9cb67bb..5d9d4afcb6 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp @@ -1059,7 +1059,7 @@ void tst_QGraphicsGridLayout::horizontalSpacing() qreal new_w = layout->sizeHint(Qt::PreferredSize, QSizeF()).width(); QCOMPARE(new_w, w - (3-1)*(oldSpacing - horizontalSpacing)); } else { - QSKIP("The current style uses non-uniform layout spacing", SkipAll); + QSKIP("The current style uses non-uniform layout spacing"); } delete widget; } @@ -1645,7 +1645,7 @@ void tst_QGraphicsGridLayout::setSpacing() QCOMPARE(newSH.height(), sh.height() - (2-1)*(oldVSpacing - spacing)); QCOMPARE(newSH.width(), sh.width() - (3-1)*(oldHSpacing - spacing)); } else { - QSKIP("The current style uses non-uniform layout spacing", SkipAll); + QSKIP("The current style uses non-uniform layout spacing"); } delete widget; } @@ -1759,7 +1759,7 @@ void tst_QGraphicsGridLayout::verticalSpacing() qreal new_h = layout->sizeHint(Qt::PreferredSize, QSizeF()).height(); QCOMPARE(new_h, h - (2-1)*(oldSpacing - verticalSpacing)); } else { - QSKIP("The current style uses non-uniform layout spacing", SkipAll); + QSKIP("The current style uses non-uniform layout spacing"); } delete widget; } diff --git a/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp b/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp index 8ac1f6b5c5..634f6826c9 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp @@ -80,7 +80,7 @@ Q_DECLARE_METATYPE(QRectF) #include <windows.h> #define Q_CHECK_PAINTEVENTS \ if (::SwitchDesktop(::GetThreadDesktop(::GetCurrentThreadId())) == 0) \ - QSKIP("The Graphics View doesn't get the paint events", SkipSingle); + QSKIP("The Graphics View doesn't get the paint events"); #else #define Q_CHECK_PAINTEVENTS #endif @@ -2393,9 +2393,8 @@ void tst_QGraphicsItem::shape() void tst_QGraphicsItem::contains() { - if (sizeof(qreal) != sizeof(double)) { - QSKIP("Skipped due to rounding errors", SkipAll); - } + if (sizeof(qreal) != sizeof(double)) + QSKIP("Skipped due to rounding errors"); // Rect QGraphicsRectItem rect(QRectF(-10, -10, 20, 20)); @@ -2673,9 +2672,8 @@ protected: void tst_QGraphicsItem::isObscured() { - if (sizeof(qreal) != sizeof(double)) { - QSKIP("Skipped due to rounding errors", SkipAll); - } + if (sizeof(qreal) != sizeof(double)) + QSKIP("Skipped due to rounding errors"); OpaqueItem *item1 = new OpaqueItem; item1->setRect(0, 0, 100, 100); @@ -5086,7 +5084,7 @@ void tst_QGraphicsItem::paint() #ifdef Q_OS_WIN32 //we try to switch the desktop: if it fails, we skip the test if (::SwitchDesktop( ::GetThreadDesktop( ::GetCurrentThreadId() ) ) == 0) { - QSKIP("The Graphics View doesn't get the paint events", SkipSingle); + QSKIP("The Graphics View doesn't get the paint events"); } #endif @@ -5827,7 +5825,7 @@ void tst_QGraphicsItem::itemClippingDiscovery() // The rect items are no longer visible at these points. QCOMPARE(scene.itemAt(10, 10), (QGraphicsItem *)0); if (sizeof(qreal) != sizeof(double)) - QSKIP("This fails due to internal rounding errors", SkipSingle); + QSKIP("This fails due to internal rounding errors"); QCOMPARE(scene.itemAt(90, 90), (QGraphicsItem *)0); } @@ -8112,7 +8110,7 @@ void tst_QGraphicsItem::sorting_data() void tst_QGraphicsItem::sorting() { if (PlatformQuirks::isAutoMaximizing()) - QSKIP("Skipped because Platform is auto maximizing", SkipAll); + QSKIP("Skipped because Platform is auto maximizing"); _paintedItems.clear(); @@ -10516,7 +10514,7 @@ public: void tst_QGraphicsItem::updateMicroFocus() { #if defined Q_OS_WIN || defined Q_OS_MAC - QSKIP("QTBUG-9578", SkipAll); + QSKIP("QTBUG-9578"); #endif QGraphicsScene scene; QWidget parent; diff --git a/tests/auto/widgets/graphicsview/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp b/tests/auto/widgets/graphicsview/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp index 873a711127..9769ff0da4 100644 --- a/tests/auto/widgets/graphicsview/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp @@ -952,7 +952,7 @@ void tst_QGraphicsLinearLayout::setSpacing() QCOMPARE(oldSizeHint.width() - oldSpacing * 2, newSizeHint.width() - spacing * 2); } else { - QSKIP("This style uses non-uniform spacings (layoutSpacingImplementation() is reimplemented)", SkipAll); + QSKIP("This style uses non-uniform spacings (layoutSpacingImplementation() is reimplemented)"); } delete widget; } @@ -998,7 +998,7 @@ void tst_QGraphicsLinearLayout::setItemSpacing() if (oldSpacing >= 0) { QCOMPARE(newSizeHint.width() - spacing, oldSizeHint.width() - oldSpacing); } else { - QSKIP("This style uses non-uniform spacings (layoutSpacingImplementation() is reimplemented)", SkipAll); + QSKIP("This style uses non-uniform spacings (layoutSpacingImplementation() is reimplemented)"); } delete widget; } diff --git a/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp b/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp index 78c545e25a..0e86c0ab48 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp @@ -1039,7 +1039,7 @@ void tst_QGraphicsProxyWidget::hoverMoveEvent() QFETCH(bool, mouseTracking); QFETCH(bool, mouseDown); - QSKIP("Ambiguous test...", SkipAll); + QSKIP("Ambiguous test..."); // proxy should translate the move events to what the widget would expect @@ -1362,7 +1362,7 @@ void tst_QGraphicsProxyWidget::sizeHint() QFETCH(QSizeF, constraint); QFETCH(QSizeF, sizeHint); QFETCH(bool, hasWidget); - QSKIP("Broken test", SkipAll); + QSKIP("Broken test"); SubQGraphicsProxyWidget proxy; QWidget *widget = new QWidget; if (hasWidget) @@ -2486,7 +2486,7 @@ void tst_QGraphicsProxyWidget::popup_basic() opt.initFrom(box); opt.editable = box->isEditable(); if (box->style()->styleHint(QStyle::SH_ComboBox_Popup, &opt)) - QSKIP("Does not work due to SH_Combobox_Popup", SkipAll); + QSKIP("Does not work due to SH_Combobox_Popup"); QCOMPARE(child->widget()->parent(), static_cast<QObject*>(box)); QTRY_COMPARE(proxy->pos(), QPointF(box->pos())); @@ -2539,7 +2539,7 @@ void tst_QGraphicsProxyWidget::popup_subwidget() opt.initFrom(box); opt.editable = box->isEditable(); if (box->style()->styleHint(QStyle::SH_ComboBox_Popup, &opt)) - QSKIP("Does not work due to SH_Combobox_Popup", SkipAll); + QSKIP("Does not work due to SH_Combobox_Popup"); QGraphicsProxyWidget *child = (QGraphicsProxyWidget*)(groupBoxProxy->childItems())[0]; QWidget *popup = child->widget(); QCOMPARE(popup->parent(), static_cast<QObject*>(box)); @@ -2675,7 +2675,7 @@ void tst_QGraphicsProxyWidget::childPos_data() void tst_QGraphicsProxyWidget::childPos() { #ifdef Q_OS_IRIX - QSKIP("This test is not reliable on IRIX.", SkipAll); + QSKIP("This test is not reliable on IRIX."); #endif QFETCH(bool, moveCombo); QFETCH(QPoint, comboPos); @@ -3630,7 +3630,7 @@ public slots: void tst_QGraphicsProxyWidget::QTBUG_6986_sendMouseEventToAlienWidget() { #if defined(Q_OS_MAC) || defined(Q_OS_WIN) || defined(QT_NO_CURSOR) - QSKIP("Test case unstable on this platform", SkipAll); + QSKIP("Test case unstable on this platform"); #endif QGraphicsView view; Scene scene; diff --git a/tests/auto/widgets/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp b/tests/auto/widgets/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp index 9ac1573b2a..db44876fd8 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp @@ -56,7 +56,7 @@ #include <windows.h> #define Q_CHECK_PAINTEVENTS \ if (::SwitchDesktop(::GetThreadDesktop(::GetCurrentThreadId())) == 0) \ - QSKIP("The Graphics View doesn't get the paint events", SkipSingle); + QSKIP("The Graphics View doesn't get the paint events"); #else #define Q_CHECK_PAINTEVENTS #endif diff --git a/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp b/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp index 0a404cab46..e41c378350 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp @@ -1624,9 +1624,9 @@ void tst_QGraphicsView::itemAt2() QVERIFY(view.itemAt(itemViewPoint + QPoint(0, -1))); QVERIFY(!view.items(itemViewPoint + QPoint(0, -1)).isEmpty()); - if (sizeof(qreal) != sizeof(double)) { - QSKIP("Skipped due to rounding errors", SkipAll); - } + if (sizeof(qreal) != sizeof(double)) + QSKIP("Skipped due to rounding errors"); + // Not here QVERIFY(!view.itemAt(itemViewPoint + QPoint(-1, 0))); QVERIFY(view.items(itemViewPoint + QPoint(-1, 0)).isEmpty()); @@ -2062,7 +2062,7 @@ void tst_QGraphicsView::wheelEvent() void tst_QGraphicsView::cursor() { if (PlatformQuirks::haveMouseCursor()) - QSKIP("The Platform does not have regular cursor support", SkipAll); + QSKIP("The Platform does not have regular cursor support"); QGraphicsScene scene; QGraphicsItem *item = scene.addRect(QRectF(-10, -10, 20, 20)); @@ -2090,7 +2090,7 @@ void tst_QGraphicsView::cursor() void tst_QGraphicsView::cursor2() { if (PlatformQuirks::haveMouseCursor()) - QSKIP("The Platform does not have regular cursor support", SkipAll); + QSKIP("The Platform does not have regular cursor support"); QGraphicsScene scene; QGraphicsItem *item = scene.addRect(QRectF(-10, -10, 20, 20)); @@ -2710,7 +2710,7 @@ void tst_QGraphicsView::scrollBarRanges() #if !defined(QT_NO_STYLE_MOTIF) view.setStyle(new QMotifStyle); #else - QSKIP("No Motif style compiled.", SkipSingle); + QSKIP("No Motif style compiled."); #endif } else { #if defined(Q_OS_WINCE) diff --git a/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp b/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp index b9c652f1d3..4d530a353b 100644 --- a/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp +++ b/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp @@ -735,7 +735,7 @@ void tst_QAbstractItemView::persistentEditorFocus() Qt::LeftButton, Qt::NoModifier); qApp->sendEvent(list.at(i), &mouseEvent); if (!qApp->focusWidget()) - QSKIP("Some window managers don't handle focus that well", SkipAll); + QSKIP("Some window managers don't handle focus that well"); QTRY_COMPARE(qApp->focusWidget(), static_cast<QWidget *>(list.at(i))); } } @@ -890,7 +890,7 @@ void tst_QAbstractItemView::dragAndDrop() // From Task 137729 #ifdef Q_WS_QWS - QSKIP("Embedded drag-and-drop not good enough yet...", SkipAll); + QSKIP("Embedded drag-and-drop not good enough yet..."); #endif const int attempts = 10; @@ -933,7 +933,7 @@ void tst_QAbstractItemView::dragAndDrop() void tst_QAbstractItemView::dragAndDropOnChild() { #ifdef Q_WS_QWS - QSKIP("Embedded drag-and-drop not good enough yet...", SkipAll); + QSKIP("Embedded drag-and-drop not good enough yet..."); #endif const int attempts = 10; @@ -1230,7 +1230,7 @@ void tst_QAbstractItemView::task250754_fontChange() void tst_QAbstractItemView::task200665_itemEntered() { #ifdef Q_OS_WINCE_WM - QSKIP("On Windows Mobile the mouse tracking is unavailable at the moment", SkipAll); + QSKIP("On Windows Mobile the mouse tracking is unavailable at the moment"); #endif //we test that view will emit entered //when the scrollbar move but not the mouse itself diff --git a/tests/auto/widgets/itemviews/qcolumnview/tst_qcolumnview.cpp b/tests/auto/widgets/itemviews/qcolumnview/tst_qcolumnview.cpp index 364f917511..218c974365 100644 --- a/tests/auto/widgets/itemviews/qcolumnview/tst_qcolumnview.cpp +++ b/tests/auto/widgets/itemviews/qcolumnview/tst_qcolumnview.cpp @@ -597,9 +597,8 @@ void tst_QColumnView::clicked() QCOMPARE(clickedSpy.count(), 1); qApp->processEvents(); - if (sizeof(qreal) != sizeof(double)) { - QSKIP("Skipped due to rounding errors", SkipAll); - } + if (sizeof(qreal) != sizeof(double)) + QSKIP("Skipped due to rounding errors"); for (int i = 0; i < view.createdColumns.count(); ++i) { QAbstractItemView *column = view.createdColumns.at(i); diff --git a/tests/auto/widgets/itemviews/qitemdelegate/tst_qitemdelegate.cpp b/tests/auto/widgets/itemviews/qitemdelegate/tst_qitemdelegate.cpp index e419a7f097..df053975af 100644 --- a/tests/auto/widgets/itemviews/qitemdelegate/tst_qitemdelegate.cpp +++ b/tests/auto/widgets/itemviews/qitemdelegate/tst_qitemdelegate.cpp @@ -72,7 +72,7 @@ Q_DECLARE_METATYPE(QAbstractItemDelegate::EndEditHint) #include <windows.h> #define Q_CHECK_PAINTEVENTS \ if (::SwitchDesktop(::GetThreadDesktop(::GetCurrentThreadId())) == 0) \ - QSKIP("The widgets don't get the paint events", SkipSingle); + QSKIP("The widgets don't get the paint events"); #else #define Q_CHECK_PAINTEVENTS #endif diff --git a/tests/auto/widgets/itemviews/qitemview/tst_qitemview.cpp b/tests/auto/widgets/itemviews/qitemview/tst_qitemview.cpp index 4c64d4c52a..d4cf3944c1 100644 --- a/tests/auto/widgets/itemviews/qitemview/tst_qitemview.cpp +++ b/tests/auto/widgets/itemviews/qitemview/tst_qitemview.cpp @@ -511,7 +511,7 @@ void tst_QItemView::resize_data() */ void tst_QItemView::resize() { - QSKIP("This test needs to be re-thought out, it takes too long and doesn't really catch the problem.", SkipAll); + QSKIP("This test needs to be re-thought out, it takes too long and doesn't really catch the problem."); QFETCH(QString, viewType); QFETCH(int, vscroll); diff --git a/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp b/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp index 2242490a44..de76768d24 100644 --- a/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp +++ b/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp @@ -3347,7 +3347,7 @@ QT_END_NAMESPACE void tst_QTableView::tabFocus() { if (!qt_tab_all_widgets) - QSKIP("This test requires full keyboard control to be enabled.", SkipAll); + QSKIP("This test requires full keyboard control to be enabled."); // QTableView enables tabKeyNavigation by default, but you should be able // to change focus on an empty table view, or on a table view that doesn't diff --git a/tests/auto/widgets/itemviews/qtreewidget/tst_qtreewidget.cpp b/tests/auto/widgets/itemviews/qtreewidget/tst_qtreewidget.cpp index 5e1faf97c4..71a82cf2bb 100644 --- a/tests/auto/widgets/itemviews/qtreewidget/tst_qtreewidget.cpp +++ b/tests/auto/widgets/itemviews/qtreewidget/tst_qtreewidget.cpp @@ -2953,7 +2953,7 @@ void tst_QTreeWidget::defaultRowSizes() } QPixmap icon = tw->style()->standardPixmap((QStyle::StandardPixmap)(i + QStyle::SP_TitleBarMenuButton)); if (icon.isNull()) - QSKIP("No pixmap found on current style, skipping this test.", SkipSingle); + QSKIP("No pixmap found on current style, skipping this test."); it->setIcon(tw->columnCount() - 1, icon.scaled(tw->iconSize())); } diff --git a/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp b/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp index c37dfc609e..80c1bdb202 100644 --- a/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp +++ b/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp @@ -339,7 +339,7 @@ void tst_QApplication::nonGui() { #ifdef Q_OS_HPUX // ### This is only to allow us to generate a test report for now. - QSKIP("This test shuts down the window manager on HP-UX.", SkipAll); + QSKIP("This test shuts down the window manager on HP-UX."); #endif int argc = 0; diff --git a/tests/auto/widgets/kernel/qgridlayout/tst_qgridlayout.cpp b/tests/auto/widgets/kernel/qgridlayout/tst_qgridlayout.cpp index 100b7eb892..11f0cfc7fb 100644 --- a/tests/auto/widgets/kernel/qgridlayout/tst_qgridlayout.cpp +++ b/tests/auto/widgets/kernel/qgridlayout/tst_qgridlayout.cpp @@ -724,7 +724,7 @@ void tst_QGridLayout::spacingsAndMargins() QSize minimumsize = vbox.totalMinimumSize(); if (topsize.width() < minimumsize.width() || topsize.height() < minimumsize.height()) - QSKIP("The screen is too small to run this test case", SkipSingle); + QSKIP("The screen is too small to run this test case"); // We are relying on the order here... for (int pi = 0; pi < sizehinters.count(); ++pi) { @@ -869,7 +869,7 @@ void tst_QGridLayout::minMaxSize() }else{ style = QStyleFactory::create(stylename); if (!style) { - QSKIP( qPrintable(QString::fromLatin1("Qt has been compiled without style: %1").arg(stylename)), SkipSingle); + QSKIP( qPrintable(QString::fromLatin1("Qt has been compiled without style: %1").arg(stylename))); } } QApplication::setStyle(style); diff --git a/tests/auto/widgets/kernel/qsound/tst_qsound.cpp b/tests/auto/widgets/kernel/qsound/tst_qsound.cpp index 7450549f47..1b8907b1be 100644 --- a/tests/auto/widgets/kernel/qsound/tst_qsound.cpp +++ b/tests/auto/widgets/kernel/qsound/tst_qsound.cpp @@ -60,7 +60,7 @@ private slots: void tst_QSound::checkFinished() { #if defined(Q_WS_QPA) - QSKIP("QSound is not implemented on Lighthouse", SkipAll); + QSKIP("QSound is not implemented on Lighthouse"); #else QSound sound(SRCDIR"4.wav"); sound.setLoops(3); @@ -76,7 +76,7 @@ void tst_QSound::checkFinished() void tst_QSound::staticPlay() { - QSKIP("Test disabled -- only for manual purposes", SkipAll); + QSKIP("Test disabled -- only for manual purposes"); #if !defined(Q_WS_QPA) // Check that you hear sound with static play also. QSound::play(SRCDIR"4.wav"); diff --git a/tests/auto/widgets/kernel/qstackedlayout/tst_qstackedlayout.cpp b/tests/auto/widgets/kernel/qstackedlayout/tst_qstackedlayout.cpp index de734877d7..66a8fe24a8 100644 --- a/tests/auto/widgets/kernel/qstackedlayout/tst_qstackedlayout.cpp +++ b/tests/auto/widgets/kernel/qstackedlayout/tst_qstackedlayout.cpp @@ -291,7 +291,7 @@ void tst_QStackedLayout::removeWidget() if (QApplication::focusWidget() == top) break; else if (i >= 5) - QSKIP("Can't get focus", SkipSingle); + QSKIP("Can't get focus"); QTest::qWait(100); ++i; } diff --git a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp index ded0c5e061..e92389ff62 100644 --- a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp +++ b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp @@ -108,7 +108,7 @@ static HWND winHandleOf(const QWidget *w) # if !defined(Q_OS_WINCE) #define Q_CHECK_PAINTEVENTS \ if (::SwitchDesktop(::GetThreadDesktop(::GetCurrentThreadId())) == 0) \ - QSKIP("desktop is not visible, this test would fail", SkipSingle); + QSKIP("desktop is not visible, this test would fail"); # else # define Q_CHECK_PAINTEVENTS # endif @@ -2407,7 +2407,7 @@ void tst_QWidget::hideWhenFocusWidgetIsChild() QString actualFocusWidget, expectedFocusWidget; #ifdef Q_WS_X11 if (!qApp->focusWidget()) - QSKIP("Your window manager is too broken for this test", SkipAll); + QSKIP("Your window manager is too broken for this test"); #endif QVERIFY(qApp->focusWidget()); actualFocusWidget.sprintf("%p %s %s", qApp->focusWidget(), qApp->focusWidget()->objectName().toLatin1().constData(), qApp->focusWidget()->metaObject()->className()); @@ -2551,7 +2551,7 @@ void tst_QWidget::setGeometry() tlw.show(); QTest::qWait(50); if (tlw.frameGeometry() != tlw.geometry()) - QSKIP("Your window manager is too broken for this test", SkipAll); + QSKIP("Your window manager is too broken for this test"); QCOMPARE(tlw.geometry(), tr); } @@ -2689,7 +2689,7 @@ void tst_QWidget::raise() #ifdef Q_OS_MAC if (child1->internalWinId()) { - QSKIP("Cocoa has no Z-Order for views, we hack it, but it results in paint events.", SkipAll); + QSKIP("Cocoa has no Z-Order for views, we hack it, but it results in paint events."); } #endif @@ -2718,7 +2718,7 @@ void tst_QWidget::raise() int expectedPaintEvents = child == child2 ? 1 : 0; int expectedZOrderChangeEvents = child == child2 ? 1 : 0; #ifdef Q_OS_MAC - QSKIP("Not yet sure why this fails.", SkipSingle); + QSKIP("Not yet sure why this fails."); #endif QTRY_COMPARE(child->numPaintEvents, expectedPaintEvents); QCOMPARE(child->numZOrderChangeEvents, expectedZOrderChangeEvents); @@ -3766,7 +3766,7 @@ void tst_QWidget::optimizedResizeMove() void tst_QWidget::optimizedResize_topLevel() { #if defined(Q_WS_MAC) || defined(Q_WS_QWS) - QSKIP("We do not yet have static contents support for *top-levels* on this platform", SkipAll); + QSKIP("We do not yet have static contents support for *top-levels* on this platform"); #endif StaticWidget topLevel; @@ -3835,7 +3835,7 @@ void tst_QWidget::childDeletesItsSibling() do { \ QSize safeSize(qt_screen->width() - 250, qt_screen->height() - 250); \ if (!safeSize.isValid()) \ - QSKIP("Screen size too small", SkipAll); \ + QSKIP("Screen size too small"); \ if (defaultSize.width() > safeSize.width() || defaultSize.height() > safeSize.height()) { \ defaultSize = safeSize; \ w.resize(defaultSize); \ @@ -6575,9 +6575,8 @@ void tst_QWidget::render_windowOpacity() QPixmap expected(child.size()); #ifdef Q_WS_X11 - if (expected.depth() < 24) { - QSKIP("This test won't give correct results with dithered pixmaps", SkipAll); - } + if (expected.depth() < 24) + QSKIP("This test won't give correct results with dithered pixmaps"); #endif expected.fill(Qt::green); QPainter painter(&expected); @@ -7661,7 +7660,7 @@ void tst_QWidget::sendUpdateRequestImmediately() { #ifdef Q_WS_MAC if (!QApplicationPrivate::graphicsSystem()) - QSKIP("We only send update requests on the Mac when passing -graphicssystem", SkipAll); + QSKIP("We only send update requests on the Mac when passing -graphicssystem"); #endif UpdateWidget updateWidget; @@ -7687,7 +7686,7 @@ void tst_QWidget::doubleRepaint() { #if defined(Q_WS_MAC) if (!macHasAccessToWindowsServer()) - QSKIP("Not having window server access causes the wrong number of repaints to be issues", SkipAll); + QSKIP("Not having window server access causes the wrong number of repaints to be issues"); #endif UpdateWidget widget; widget.setFocusPolicy(Qt::StrongFocus); @@ -9035,7 +9034,7 @@ void tst_QWidget::inputFocus_task257832() QLineEdit *widget = new QLineEdit; QInputContext *context = widget->inputContext(); if (!context) - QSKIP("No input context", SkipSingle); + QSKIP("No input context"); widget->setFocus(); widget->winId(); // make sure, widget has been created context->setFocusWidget(widget); diff --git a/tests/auto/widgets/styles/qstyle/tst_qstyle.cpp b/tests/auto/widgets/styles/qstyle/tst_qstyle.cpp index 0045dbbb52..1f26e42515 100644 --- a/tests/auto/widgets/styles/qstyle/tst_qstyle.cpp +++ b/tests/auto/widgets/styles/qstyle/tst_qstyle.cpp @@ -368,7 +368,7 @@ void tst_QStyle::testScrollBarSubControls(QStyle* style) { #ifdef Q_OS_WINCE_WM if (qobject_cast<QWindowsMobileStyle*>(style) && qt_wince_is_smartphone()) - QSKIP("SmartPhone doesn't have scrollbar subcontrols.", SkipAll); + QSKIP("SmartPhone doesn't have scrollbar subcontrols."); #else Q_UNUSED(style); #endif diff --git a/tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp b/tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp index c5591c48ab..2e5ddb4695 100644 --- a/tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp +++ b/tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp @@ -777,9 +777,8 @@ void tst_QStyleSheetStyle::focusColors() QImage image(frame.width(), frame.height(), QImage::Format_ARGB32); frame.render(&image); - if (image.depth() < 24) { - QSKIP("Test doesn't support color depth < 24", SkipAll); - } + if (image.depth() < 24) + QSKIP("Test doesn't support color depth < 24"); QVERIFY2(testForColors(image, QColor(0xe8, 0xff, 0x66)), (QString::fromLatin1(widget->metaObject()->className()) @@ -798,7 +797,7 @@ void tst_QStyleSheetStyle::focusColors() void tst_QStyleSheetStyle::hoverColors() { if (!PlatformQuirks::haveMouseCursor()) - QSKIP("No mouse Cursor on this platform",SkipAll); + QSKIP("No mouse Cursor on this platform"); QList<QWidget *> widgets; widgets << new QPushButton("TESTING"); widgets << new QLineEdit("TESTING"); @@ -937,9 +936,8 @@ void tst_QStyleSheetStyle::background() QImage image(widget->width(), widget->height(), QImage::Format_ARGB32); widget->render(&image); - if (image.depth() < 24) { - QSKIP("Test doesn't support color depth < 24", SkipAll); - } + if (image.depth() < 24) + QSKIP("Test doesn't support color depth < 24"); QVERIFY2(testForColors(image, QColor(0xe8, 0xff, 0x66)), (QString::fromLatin1(widget->metaObject()->className()) @@ -1470,9 +1468,8 @@ void tst_QStyleSheetStyle::complexWidgetFocus() QImage image(frame.width(), frame.height(), QImage::Format_ARGB32); frame.render(&image); - if (image.depth() < 24) { - QSKIP("Test doesn't support color depth < 24", SkipAll); - } + if (image.depth() < 24) + QSKIP("Test doesn't support color depth < 24"); QVERIFY2(testForColors(image, QColor(0xff, 0x00, 0x84)), (QString::fromLatin1(widget->metaObject()->className()) @@ -1547,9 +1544,8 @@ void tst_QStyleSheetStyle::task232085_spinBoxLineEditBg() QImage image(frame.width(), frame.height(), QImage::Format_ARGB32); frame.render(&image); - if (image.depth() < 24) { - QSKIP("Test doesn't support color depth < 24", SkipAll); - } + if (image.depth() < 24) + QSKIP("Test doesn't support color depth < 24"); QVERIFY2(testForColors(image, QColor(0xe8, 0xff, 0x66)), (QString::fromLatin1(spinbox->metaObject()->className()) diff --git a/tests/auto/widgets/util/qundogroup/tst_qundogroup.cpp b/tests/auto/widgets/util/qundogroup/tst_qundogroup.cpp index 6d51252e22..4d37daf681 100644 --- a/tests/auto/widgets/util/qundogroup/tst_qundogroup.cpp +++ b/tests/auto/widgets/util/qundogroup/tst_qundogroup.cpp @@ -609,9 +609,8 @@ void tst_QUndoGroup::commandTextFormat() { QString binDir = QLibraryInfo::location(QLibraryInfo::BinariesPath); - if (QProcess::execute(binDir + "/lrelease -version") != 0) { - QSKIP("lrelease is missing or broken", SkipAll); - } + if (QProcess::execute(binDir + "/lrelease -version") != 0) + QSKIP("lrelease is missing or broken"); QVERIFY(!QProcess::execute(binDir + "/lrelease testdata/qundogroup.ts")); @@ -654,11 +653,11 @@ public: tst_QUndoGroup() {} private slots: - void setActive() { QSKIP( "Not tested on irix-g++", SkipAll); } - void addRemoveStack() { QSKIP( "Not tested on irix-g++", SkipAll); } - void deleteStack() { QSKIP( "Not tested on irix-g++", SkipAll); } - void checkSignals() { QSKIP( "Not tested on irix-g++", SkipAll); } - void addStackAndDie() { QSKIP( "Not tested on irix-g++", SkipAll); } + void setActive() { QSKIP( "Not tested on irix-g++"); } + void addRemoveStack() { QSKIP( "Not tested on irix-g++"); } + void deleteStack() { QSKIP( "Not tested on irix-g++"); } + void checkSignals() { QSKIP( "Not tested on irix-g++"); } + void addStackAndDie() { QSKIP( "Not tested on irix-g++"); } }; #endif diff --git a/tests/auto/widgets/util/qundostack/tst_qundostack.cpp b/tests/auto/widgets/util/qundostack/tst_qundostack.cpp index 834c2d5d50..b1fa420a60 100644 --- a/tests/auto/widgets/util/qundostack/tst_qundostack.cpp +++ b/tests/auto/widgets/util/qundostack/tst_qundostack.cpp @@ -2971,9 +2971,8 @@ void tst_QUndoStack::commandTextFormat() { QString binDir = QLibraryInfo::location(QLibraryInfo::BinariesPath); - if (QProcess::execute(binDir + "/lrelease -version") != 0) { - QSKIP("lrelease is missing or broken", SkipAll); - } + if (QProcess::execute(binDir + "/lrelease -version") != 0) + QSKIP("lrelease is missing or broken"); QVERIFY(!QProcess::execute(binDir + "/lrelease testdata/qundostack.ts")); diff --git a/tests/auto/widgets/widgets/qabstractbutton/tst_qabstractbutton.cpp b/tests/auto/widgets/widgets/qabstractbutton/tst_qabstractbutton.cpp index f5f60c8fd3..526cfff1ee 100644 --- a/tests/auto/widgets/widgets/qabstractbutton/tst_qabstractbutton.cpp +++ b/tests/auto/widgets/widgets/qabstractbutton/tst_qabstractbutton.cpp @@ -593,7 +593,7 @@ void tst_QAbstractButton::stopRepeatTimer() void tst_QAbstractButton::keyNavigation() { - QSKIP("Key navigation in QAbstractButton will be fixed/improved as part of task 194373", SkipSingle); + QSKIP("Key navigation in QAbstractButton will be fixed/improved as part of task 194373"); QWidget widget; QGridLayout *layout = new QGridLayout(&widget); diff --git a/tests/auto/widgets/widgets/qbuttongroup/tst_qbuttongroup.cpp b/tests/auto/widgets/widgets/qbuttongroup/tst_qbuttongroup.cpp index f9f6ec0a54..c48efcd5eb 100644 --- a/tests/auto/widgets/widgets/qbuttongroup/tst_qbuttongroup.cpp +++ b/tests/auto/widgets/widgets/qbuttongroup/tst_qbuttongroup.cpp @@ -131,7 +131,7 @@ QT_END_NAMESPACE void tst_QButtonGroup::arrowKeyNavigation() { if (!qt_tab_all_widgets) - QSKIP("This test requires full keyboard control to be enabled.", SkipAll); + QSKIP("This test requires full keyboard control to be enabled."); QDialog dlg(0); QHBoxLayout layout(&dlg); diff --git a/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp b/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp index cb4468f6f4..8f6d5bc0e0 100644 --- a/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp +++ b/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp @@ -460,7 +460,7 @@ void tst_QComboBox::setPalette() { #ifdef Q_WS_MAC if (qobject_cast<QMacStyle *>(testWidget->style())) { - QSKIP("This test doesn't make sense for pixmap-based styles", SkipAll); + QSKIP("This test doesn't make sense for pixmap-based styles"); } #endif QPalette pal = testWidget->palette(); diff --git a/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp b/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp index c64c9e7019..c83634a6a7 100644 --- a/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp +++ b/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp @@ -2537,7 +2537,7 @@ void tst_QDateTimeEdit::newCase() { if (QDate::shortMonthName(6) != "Jun" || QDate::shortMonthName(7) != "Jul" || QDate::longMonthName(6) != "June" || QDate::longMonthName(7) != "July") - QSKIP("This test only works in English", SkipAll); + QSKIP("This test only works in English"); testWidget->setDisplayFormat("MMMM'a'MbMMMcMM"); testWidget->setDate(QDate(2005, 6, 1)); @@ -2584,7 +2584,7 @@ void tst_QDateTimeEdit::newCase2() void tst_QDateTimeEdit::newCase3() { if (!QDate::longMonthName(1).startsWith("Januar")) - QSKIP("This test does not work in this locale", SkipAll); + QSKIP("This test does not work in this locale"); testWidget->setDisplayFormat("dd MMMM yyyy"); testWidget->setDate(QDate(2000, 1, 1)); @@ -2605,7 +2605,7 @@ void tst_QDateTimeEdit::newCase3() void tst_QDateTimeEdit::cursorPos() { if (QDate::longMonthName(1) != "January") - QSKIP("This test only works in English", SkipAll); + QSKIP("This test only works in English"); testWidget->setDisplayFormat("dd MMMM yyyy"); //testWidget->setGeometry(0, 0, 200, 200); @@ -3210,7 +3210,7 @@ void tst_QDateTimeEdit::timeSpec() QVERIFY(edit.minimumDateTime().timeSpec() != min.timeSpec()); QCOMPARE(edit.minimumDateTime().toTime_t(), min.toTime_t()); } else { - QSKIP("Not tested in the GMT timezone", SkipAll); + QSKIP("Not tested in the GMT timezone"); } } diff --git a/tests/auto/widgets/widgets/qdockwidget/tst_qdockwidget.cpp b/tests/auto/widgets/widgets/qdockwidget/tst_qdockwidget.cpp index 2c1f7c0954..cd0b95160d 100644 --- a/tests/auto/widgets/widgets/qdockwidget/tst_qdockwidget.cpp +++ b/tests/auto/widgets/widgets/qdockwidget/tst_qdockwidget.cpp @@ -842,7 +842,7 @@ void tst_QDockWidget::taskQTBUG_1665_closableChanged() QDockWidgetLayout *l = qobject_cast<QDockWidgetLayout*>(dock.layout()); if (l && !l->nativeWindowDeco()) - QSKIP("this machine doesn't support native dock widget", SkipAll); + QSKIP("this machine doesn't support native dock widget"); QVERIFY(dock.windowFlags() & Qt::WindowCloseButtonHint); diff --git a/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp b/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp index 6e4726e5b5..841fbbd955 100644 --- a/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp +++ b/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp @@ -1424,7 +1424,7 @@ static bool nativeClipboardWorking() void tst_QLineEdit::QTBUG5786_undoPaste() { if (!nativeClipboardWorking()) - QSKIP("this machine doesn't support the clipboard", SkipAll); + QSKIP("this machine doesn't support the clipboard"); QString initial("initial"); QString string("test"); QString additional("add"); @@ -2803,7 +2803,7 @@ void tst_QLineEdit::cut() if (status == noErr) CFRelease(pasteboard); else - QSKIP("Autotests run from cron and pasteboard don't get along quite ATM", SkipAll); + QSKIP("Autotests run from cron and pasteboard don't get along quite ATM"); } #endif // test newlines in cut'n'paste diff --git a/tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp b/tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp index 9722a3194b..966f5842a0 100644 --- a/tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp +++ b/tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp @@ -1648,7 +1648,7 @@ void tst_QMainWindow::addToolbarAfterShow() void tst_QMainWindow::centralWidgetSize() { if(PlatformQuirks::isAutoMaximizing()) - QSKIP("The platform is auto maximizing, so the test makes no sense", SkipAll);; + QSKIP("The platform is auto maximizing, so the test makes no sense");; QMainWindow mainWindow; mainWindow.menuBar()->addMenu("menu"); diff --git a/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp b/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp index a4ce94cc3d..59fbdafbaf 100644 --- a/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp +++ b/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp @@ -515,7 +515,7 @@ void tst_QMdiArea::subWindowActivated2() spy.clear(); if (PlatformQuirks::isAutoMaximizing()) - QSKIP("Platform is auto maximizing, so no showMinimized()", SkipAll); + QSKIP("Platform is auto maximizing, so no showMinimized()"); // Check that we only emit _one_ signal and the active window // is unchanged after showMinimized/showNormal. @@ -531,7 +531,7 @@ void tst_QMdiArea::subWindowActivated2() QEXPECT_FAIL("", "task 168682", Abort); #endif #ifdef Q_OS_WINCE - QSKIP("Not fixed yet. See Task 197453", SkipAll); + QSKIP("Not fixed yet. See Task 197453"); #endif QTRY_COMPARE(spy.count(), 1); QVERIFY(!mdiArea.activeSubWindow()); @@ -1757,7 +1757,7 @@ void tst_QMdiArea::tileSubWindows() const int spacing = 2 * frameWidth + 2; const QSize expectedViewportSize(3 * minSize.width() + spacing, 3 * minSize.height() + spacing); #ifdef Q_OS_WINCE - QSKIP("Not fixed yet! See task 197453", SkipAll); + QSKIP("Not fixed yet! See task 197453"); #endif QTRY_COMPARE(workspace.viewport()->rect().size(), expectedViewportSize); @@ -2714,7 +2714,7 @@ void tst_QMdiArea::nativeSubWindows() #ifndef QT_NO_OPENGL { if (!QGLFormat::hasOpenGL()) - QSKIP("QGL not supported on this platform", SkipAll); + QSKIP("QGL not supported on this platform"); QMdiArea mdiArea; QGLWidget *glViewport = new QGLWidget; @@ -2728,7 +2728,7 @@ void tst_QMdiArea::nativeSubWindows() const QGLContext *context = glViewport->context(); if (!context || !context->isValid()) - QSKIP("QGL is broken, cannot continue test", SkipAll); + QSKIP("QGL is broken, cannot continue test"); // The viewport and all the sub-windows must be native. QVERIFY(mdiArea.viewport()->internalWinId()); diff --git a/tests/auto/widgets/widgets/qmdisubwindow/tst_qmdisubwindow.cpp b/tests/auto/widgets/widgets/qmdisubwindow/tst_qmdisubwindow.cpp index f7593336e1..72c6335fdb 100644 --- a/tests/auto/widgets/widgets/qmdisubwindow/tst_qmdisubwindow.cpp +++ b/tests/auto/widgets/widgets/qmdisubwindow/tst_qmdisubwindow.cpp @@ -598,7 +598,7 @@ void tst_QMdiSubWindow::showShaded() QTest::qWait(250); #ifdef Q_OS_WINCE - QSKIP("Until we have a QEvent::WindowFlagsChange event, this will skip", SkipAll); + QSKIP("Until we have a QEvent::WindowFlagsChange event, this will skip"); #endif const QSize minimumSizeHint = window->minimumSizeHint(); @@ -907,7 +907,7 @@ void tst_QMdiSubWindow::setWindowFlags_data() void tst_QMdiSubWindow::setWindowFlags() { - QSKIP("Until we have a QEvent::WindowFlagsChange event, this will skip", SkipAll); + QSKIP("Until we have a QEvent::WindowFlagsChange event, this will skip"); QFETCH(Qt::WindowType, windowType); QFETCH(Qt::WindowType, expectedWindowType); QFETCH(Qt::WindowFlags, customFlags); @@ -968,7 +968,7 @@ void tst_QMdiSubWindow::mouseDoubleClick() QCOMPARE(window->geometry(), originalGeometry); // With Qt::WindowShadeButtonHint flag set - QSKIP("Until we have a QEvent::WindowFlagsChange event, this will skip", SkipAll); + QSKIP("Until we have a QEvent::WindowFlagsChange event, this will skip"); window->setWindowFlags(window->windowFlags() | Qt::WindowShadeButtonHint); QVERIFY(window->windowFlags() & Qt::WindowShadeButtonHint); originalGeometry = window->geometry(); diff --git a/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp b/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp index d115da865b..306cd892ed 100644 --- a/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp +++ b/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp @@ -381,7 +381,7 @@ void tst_QMenu::focus() #ifdef Q_WS_MAC if (!qt_tab_all_widgets) QSKIP("Computer is currently set up to NOT tab to all widgets," - " this test assumes you can tab to all widgets", SkipAll); + " this test assumes you can tab to all widgets"); #endif QWidget window; @@ -675,7 +675,7 @@ void tst_QMenu::task250673_activeMultiColumnSubMenuPosition() if (sub.style()->styleHint(QStyle::SH_Menu_Scrollable, 0, &sub)) { //the style prevents the menus from getting columns - QSKIP("the style doesn't support multiple columns, it makes the menu scrollable", SkipSingle); + QSKIP("the style doesn't support multiple columns, it makes the menu scrollable"); } sub.addAction("Sub-Item1"); @@ -774,7 +774,7 @@ public: void tst_QMenu::task258920_mouseBorder() { #ifdef Q_WS_QPA - QSKIP("QTBUG-20753 QCursor::setPos() / QTest::mouseMove() doesn't work on qpa", SkipAll); + QSKIP("QTBUG-20753 QCursor::setPos() / QTest::mouseMove() doesn't work on qpa"); #endif Menu258920 menu; // For styles which inherit from QWindowsStyle, styleHint(QStyle::SH_Menu_MouseTracking) is true. @@ -842,7 +842,7 @@ void tst_QMenu::pushButtonPopulateOnAboutToShow() // (kwin in kde4 does, for example, since the button would probably appear behind // or partially behind the taskbar). // Your best bet is to run this test _without_ a WM. - QSKIP("Your window manager won't allow a window against the bottom of the screen", SkipAll); + QSKIP("Your window manager won't allow a window against the bottom of the screen"); } QTimer::singleShot(300,lastMenu, SLOT(hide())); diff --git a/tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp b/tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp index dc3b81920d..4a6123cdc3 100644 --- a/tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp +++ b/tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp @@ -853,7 +853,7 @@ void tst_QMenuBar::check_escKey() // void tst_QMenuBar::check_mouse1() // { // if (QSystem::curStyle() == "Motif") -// QSKIP("This fails in Motif due to a bug in the testing framework", SkipAll); +// QSKIP("This fails in Motif due to a bug in the testing framework"); // QFETCH( QString, popup_item ); // QFETCH( int, itemA_count ); // QFETCH( int, itemB_count ); @@ -914,7 +914,7 @@ void tst_QMenuBar::check_escKey() // void tst_QMenuBar::check_mouse2() // { // if (QSystem::curStyle() == "Motif") -// QSKIP("This fails in Motif due to a bug in the testing framework", SkipAll); +// QSKIP("This fails in Motif due to a bug in the testing framework"); // QFETCH( QString, label ); // QFETCH( int, itemA_count ); // QFETCH( int, itemB_count ); @@ -991,7 +991,7 @@ void tst_QMenuBar::check_altPress() { if ( !qApp->style()->styleHint(QStyle::SH_MenuBar_AltKeyNavigation) ) { QSKIP( QString( "this is not supposed to work in the %1 style. Skipping." ). - arg( qApp->style()->objectName() ).toAscii(), SkipAll ); + arg( qApp->style()->objectName() ).toAscii()); } initSimpleMenubar(); diff --git a/tests/auto/widgets/widgets/qplaintextedit/tst_qplaintextedit.cpp b/tests/auto/widgets/widgets/qplaintextedit/tst_qplaintextedit.cpp index d847f295e0..c9b3a3c6f1 100644 --- a/tests/auto/widgets/widgets/qplaintextedit/tst_qplaintextedit.cpp +++ b/tests/auto/widgets/widgets/qplaintextedit/tst_qplaintextedit.cpp @@ -307,7 +307,7 @@ void tst_QPlainTextEdit::createSelection() void tst_QPlainTextEdit::clearMustNotChangeClipboard() { if (!nativeClipboardWorking()) - QSKIP("Clipboard not working with cron-started unit tests", SkipAll); + QSKIP("Clipboard not working with cron-started unit tests"); ed->textCursor().insertText("Hello World"); QString txt("This is different text"); QApplication::clipboard()->setText(txt); @@ -340,7 +340,7 @@ void tst_QPlainTextEdit::paragSeparatorOnPlaintextAppend() void tst_QPlainTextEdit::selectAllSetsNotSelection() { if (!QApplication::clipboard()->supportsSelection()) - QSKIP("Test only relevant for systems with selection", SkipAll); + QSKIP("Test only relevant for systems with selection"); QApplication::clipboard()->setText(QString("foobar"), QClipboard::Selection); QVERIFY(QApplication::clipboard()->text(QClipboard::Selection) == QString("foobar")); @@ -484,7 +484,7 @@ void tst_QPlainTextEdit::setTextCursor() void tst_QPlainTextEdit::undoAvailableAfterPaste() { if (!nativeClipboardWorking()) - QSKIP("Clipboard not working with cron-started unit tests", SkipAll); + QSKIP("Clipboard not working with cron-started unit tests"); QSignalSpy spy(ed->document(), SIGNAL(undoAvailable(bool))); @@ -677,7 +677,7 @@ void tst_QPlainTextEdit::preserveCharFormatInAppend() void tst_QPlainTextEdit::copyAndSelectAllInReadonly() { if (!nativeClipboardWorking()) - QSKIP("Clipboard not working with cron-started unit tests", SkipAll); + QSKIP("Clipboard not working with cron-started unit tests"); ed->setReadOnly(true); ed->setPlainText("Hello World"); @@ -1012,7 +1012,7 @@ void tst_QPlainTextEdit::copyAvailable() QFETCH(QString, function); #ifdef Q_WS_MAC - QSKIP("copyAvailable has never passed on Mac, task to fix is 132482", SkipAll); + QSKIP("copyAvailable has never passed on Mac, task to fix is 132482"); #endif ed->clear(); QApplication::clipboard()->clear(); @@ -1194,7 +1194,7 @@ void tst_QPlainTextEdit::selectWordsFromStringsContainingSeparators() void tst_QPlainTextEdit::canPaste() { if (!nativeClipboardWorking()) - QSKIP("Clipboard not working with cron-started unit tests", SkipAll); + QSKIP("Clipboard not working with cron-started unit tests"); QApplication::clipboard()->setText(QString()); QVERIFY(!ed->canPaste()); diff --git a/tests/auto/widgets/widgets/qpushbutton/tst_qpushbutton.cpp b/tests/auto/widgets/widgets/qpushbutton/tst_qpushbutton.cpp index e5083553e2..c79d157880 100644 --- a/tests/auto/widgets/widgets/qpushbutton/tst_qpushbutton.cpp +++ b/tests/auto/widgets/widgets/qpushbutton/tst_qpushbutton.cpp @@ -580,8 +580,7 @@ void tst_QPushButton::sizeHint() QStyle *style = QStyleFactory::create(stylename); if (!style) - QSKIP(qPrintable(QString::fromLatin1("Qt has been compiled without style: %1") - .arg(stylename)), SkipSingle); + QSKIP(qPrintable(QString::fromLatin1("Qt has been compiled without style: %1").arg(stylename))); QApplication::setStyle(style); // Test 1 diff --git a/tests/auto/widgets/widgets/qscrollbar/tst_qscrollbar.cpp b/tests/auto/widgets/widgets/qscrollbar/tst_qscrollbar.cpp index c4b64f3f1e..3bd5da4649 100644 --- a/tests/auto/widgets/widgets/qscrollbar/tst_qscrollbar.cpp +++ b/tests/auto/widgets/widgets/qscrollbar/tst_qscrollbar.cpp @@ -94,7 +94,7 @@ void tst_QScrollBar::scrollSingleStep() QStyle::SC_ScrollBarAddLine, testWidget); if (!sr.isValid()) - QSKIP("SC_ScrollBarAddLine not valid", SkipAll); + QSKIP("SC_ScrollBarAddLine not valid"); QTest::mouseClick(testWidget, Qt::LeftButton, Qt::NoModifier, QPoint(sr.x(), sr.y())); QTest::qWait(510); // initial delay is 500 for setRepeatAction diff --git a/tests/auto/widgets/widgets/qtabbar/tst_qtabbar.cpp b/tests/auto/widgets/widgets/qtabbar/tst_qtabbar.cpp index a1a8f3b0aa..d43e17135a 100644 --- a/tests/auto/widgets/widgets/qtabbar/tst_qtabbar.cpp +++ b/tests/auto/widgets/widgets/qtabbar/tst_qtabbar.cpp @@ -283,7 +283,7 @@ void tst_QTabBar::setElideMode() void tst_QTabBar::sizeHints() { QTabBar tabBar; - QSKIP("To be fixed on Mac (font size below not large enough) and Linux QWS (probably too large for the screen).", SkipSingle); + QSKIP("To be fixed on Mac (font size below not large enough) and Linux QWS (probably too large for the screen)."); tabBar.setFont(QFont("Arial", 10)); tabBar.addTab("tab 01"); tabBar.addTab("tab 02"); diff --git a/tests/auto/widgets/widgets/qtabwidget/tst_qtabwidget.cpp b/tests/auto/widgets/widgets/qtabwidget/tst_qtabwidget.cpp index 6d356dee9b..deaece337d 100644 --- a/tests/auto/widgets/widgets/qtabwidget/tst_qtabwidget.cpp +++ b/tests/auto/widgets/widgets/qtabwidget/tst_qtabwidget.cpp @@ -54,7 +54,7 @@ # include <qt_windows.h> #define Q_CHECK_PAINTEVENTS \ if (::SwitchDesktop(::GetThreadDesktop(::GetCurrentThreadId())) == 0) \ - QSKIP("desktop is not visible, this test would fail", SkipSingle); + QSKIP("desktop is not visible, this test would fail"); #else #define Q_CHECK_PAINTEVENTS #endif diff --git a/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp b/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp index 481bda962a..66ded68a7f 100644 --- a/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp +++ b/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp @@ -495,7 +495,7 @@ void tst_QTextEdit::createSelection() void tst_QTextEdit::clearMustNotChangeClipboard() { if (!nativeClipboardWorking()) - QSKIP("Clipboard not working with cron-started unit tests", SkipAll); + QSKIP("Clipboard not working with cron-started unit tests"); ed->textCursor().insertText("Hello World"); QString txt("This is different text"); QApplication::clipboard()->setText(txt); @@ -570,7 +570,7 @@ void tst_QTextEdit::layoutingLoop() void tst_QTextEdit::selectAllSetsNotSelection() { if (!QApplication::clipboard()->supportsSelection()) { - QSKIP("Test only relevant for systems with selection", SkipAll); + QSKIP("Test only relevant for systems with selection"); return; } @@ -784,7 +784,7 @@ void tst_QTextEdit::setTextCursor() void tst_QTextEdit::undoAvailableAfterPaste() { if (!nativeClipboardWorking()) - QSKIP("Clipboard not working with cron-started unit tests", SkipAll); + QSKIP("Clipboard not working with cron-started unit tests"); QSignalSpy spy(ed->document(), SIGNAL(undoAvailable(bool))); @@ -1005,7 +1005,7 @@ void tst_QTextEdit::preserveCharFormatInAppend() void tst_QTextEdit::copyAndSelectAllInReadonly() { if (!nativeClipboardWorking()) - QSKIP("Clipboard not working with cron-started unit tests", SkipAll); + QSKIP("Clipboard not working with cron-started unit tests"); ed->setReadOnly(true); ed->setPlainText("Hello World"); @@ -1357,7 +1357,7 @@ void tst_QTextEdit::copyAvailable() QFETCH(QString, function); #ifdef Q_WS_MAC - QSKIP("copyAvailable has never passed on Mac, task to fix is 132482", SkipAll); + QSKIP("copyAvailable has never passed on Mac, task to fix is 132482"); #endif ed->clear(); QApplication::clipboard()->clear(); @@ -1551,7 +1551,7 @@ void tst_QTextEdit::selectWordsFromStringsContainingSeparators() void tst_QTextEdit::canPaste() { if (!nativeClipboardWorking()) - QSKIP("Clipboard not working with cron-started unit tests", SkipAll); + QSKIP("Clipboard not working with cron-started unit tests"); QApplication::clipboard()->setText(QString()); QVERIFY(!ed->canPaste()); @@ -1853,7 +1853,7 @@ void tst_QTextEdit::copyPasteBackgroundImage() { #ifndef QT_NO_CLIPBOARD if (!nativeClipboardWorking()) - QSKIP("Native clipboard not working in this setup", SkipAll); + QSKIP("Native clipboard not working in this setup"); QImage foo(16, 16, QImage::Format_ARGB32_Premultiplied); foo.save("foo.png"); diff --git a/tests/auto/widgets/widgets/qworkspace/tst_qworkspace.cpp b/tests/auto/widgets/widgets/qworkspace/tst_qworkspace.cpp index a996c38438..d93043c12b 100644 --- a/tests/auto/widgets/widgets/qworkspace/tst_qworkspace.cpp +++ b/tests/auto/widgets/widgets/qworkspace/tst_qworkspace.cpp @@ -369,7 +369,7 @@ void tst_QWorkspace::showWindows() void tst_QWorkspace::changeWindowTitle() { #ifdef Q_OS_WINCE - QSKIP( "Test fails on Windows CE due to QWorkspace state handling", SkipAll); + QSKIP( "Test fails on Windows CE due to QWorkspace state handling"); #endif const QString mwc( "MainWindow's Caption" ); const QString mwc2( "MainWindow's New Caption" ); diff --git a/tests/auto/xml/sax/qxmlsimplereader/tst_qxmlsimplereader.cpp b/tests/auto/xml/sax/qxmlsimplereader/tst_qxmlsimplereader.cpp index b2b0cc20a3..6c66762904 100644 --- a/tests/auto/xml/sax/qxmlsimplereader/tst_qxmlsimplereader.cpp +++ b/tests/auto/xml/sax/qxmlsimplereader/tst_qxmlsimplereader.cpp @@ -577,7 +577,7 @@ void tst_QXmlSimpleReader::inputFromSocket() QFETCH(QString, file_name); #if defined(Q_OS_WIN32) && (defined(Q_CC_INTEL) || defined(Q_CC_MSVC_NET)) - QSKIP("Regression caused by QHOstInfo change 294548, see task 202231.", SkipAll); + QSKIP("Regression caused by QHOstInfo change 294548, see task 202231."); #endif QTcpSocket sock; sock.connectToHost(QHostAddress::LocalHost, TEST_PORT); diff --git a/tests/baselineserver/shared/qbaselinetest.h b/tests/baselineserver/shared/qbaselinetest.h index e76c32562f..8594799447 100644 --- a/tests/baselineserver/shared/qbaselinetest.h +++ b/tests/baselineserver/shared/qbaselinetest.h @@ -57,7 +57,7 @@ do {\ if (!QBaselineTest::checkImage((image), (name), (checksum), &_msg, &_err)) {\ QFAIL(_msg.constData());\ } else if (_err) {\ - QSKIP(_msg.constData(), SkipSingle);\ + QSKIP(_msg.constData());\ }\ } while (0) @@ -70,7 +70,7 @@ do {\ if (!QBaselineTest::testImage((image), &_msg, &_err)) {\ QFAIL(_msg.constData());\ } else if (_err) {\ - QSKIP(_msg.constData(), SkipSingle);\ + QSKIP(_msg.constData());\ }\ } while (0) diff --git a/tests/benchmarks/corelib/io/qfile/main.cpp b/tests/benchmarks/corelib/io/qfile/main.cpp index db240451fb..fa13aa977f 100644 --- a/tests/benchmarks/corelib/io/qfile/main.cpp +++ b/tests/benchmarks/corelib/io/qfile/main.cpp @@ -237,7 +237,7 @@ void tst_qfile::readBigFile() #ifndef Q_OS_WIN if (testType == Win32Benchmark) - QSKIP("This is Windows only benchmark.", SkipSingle); + QSKIP("This is Windows only benchmark."); #endif char *buffer = new char[BUFSIZE]; @@ -575,7 +575,7 @@ void tst_qfile::readSmallFiles() #ifndef Q_OS_WIN if (testType == Win32Benchmark) - QSKIP("This is Windows only benchmark.", SkipSingle); + QSKIP("This is Windows only benchmark."); #endif createSmallFiles(); diff --git a/tests/manual/network_remote_stresstest/tst_network_remote_stresstest.cpp b/tests/manual/network_remote_stresstest/tst_network_remote_stresstest.cpp index f35308d4c8..59a8e9ea90 100644 --- a/tests/manual/network_remote_stresstest/tst_network_remote_stresstest.cpp +++ b/tests/manual/network_remote_stresstest/tst_network_remote_stresstest.cpp @@ -154,7 +154,7 @@ void tst_NetworkRemoteStressTest::init() // clear the internal cache #ifndef QT_BUILD_INTERNAL if (strncmp(QTest::currentTestFunction(), "nam") == 0) - QSKIP("QNetworkAccessManager tests disabled", SkipAll); + QSKIP("QNetworkAccessManager tests disabled"); #endif } diff --git a/tests/manual/network_stresstest/tst_network_stresstest.cpp b/tests/manual/network_stresstest/tst_network_stresstest.cpp index 2da83f09a7..ca5486e09b 100644 --- a/tests/manual/network_stresstest/tst_network_stresstest.cpp +++ b/tests/manual/network_stresstest/tst_network_stresstest.cpp @@ -138,7 +138,7 @@ void tst_NetworkStressTest::init() // clear the internal cache #ifndef QT_BUILD_INTERNAL if (strncmp(QTest::currentTestFunction(), "nam") == 0) - QSKIP("QNetworkAccessManager tests disabled", SkipAll); + QSKIP("QNetworkAccessManager tests disabled"); #endif } @@ -630,7 +630,7 @@ void tst_NetworkStressTest::parallelConnectDisconnect() if (parallelAttempts > 100) { QFETCH_GLOBAL(bool, isLocalhost); if (!isLocalhost) - QSKIP("Localhost-only test", SkipSingle); + QSKIP("Localhost-only test"); } qint64 totalBytes = 0; @@ -714,7 +714,7 @@ void tst_NetworkStressTest::namGet() if (parallelAttempts > 100) { QFETCH_GLOBAL(bool, isLocalhost); if (!isLocalhost) - QSKIP("Localhost-only test", SkipSingle); + QSKIP("Localhost-only test"); } qint64 totalBytes = 0; diff --git a/tests/shared/filesystem.h b/tests/shared/filesystem.h index 3e2436cdf6..14cd3a790b 100644 --- a/tests/shared/filesystem.h +++ b/tests/shared/filesystem.h @@ -133,7 +133,7 @@ struct FileSystem GetVolumeInformationW( (wchar_t*)linkName.left(3).utf16(), NULL, 0, NULL, NULL, NULL, fileSystem, sizeof(fileSystem)/sizeof(WCHAR)); if(QString().fromWCharArray(fileSystem) != "NTFS") - QSKIP("This seems not to be an NTFS volume. Junctions are not allowed.",SkipSingle); + QSKIP("This seems not to be an NTFS volume. Junctions are not allowed."); if (!target.startsWith("\\??\\") && !target.startsWith("\\\\?\\")) { QFileInfo targetInfo(target); |