From 27f9f136f7e39b5d612bc02f7ff8778ab424c07d Mon Sep 17 00:00:00 2001 From: Jason McDonald Date: Wed, 19 Oct 2011 12:53:13 +1000 Subject: Remove SkipMode parameter from QSKIP calls. The previous commit removed SkipMode from the testlib APi. This commit removes the parameter from all calls to QSKIP. Task-number: QTBUG-21851, QTBUG-21652 Change-Id: I21c0ee6731c1bc6ac6d962590d9b31d7459dfbc5 Reviewed-by: Rohan McGovern --- tests/auto/corelib/io/qfile/largefile/tst_largefile.cpp | 2 +- tests/auto/corelib/io/qfile/tst_qfile.cpp | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'tests/auto/corelib/io/qfile') 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 -- cgit v1.2.3