Remove SkipMode parameter from QSKIP.

The SkipMode parameter has been removed from the API in qtbase, so it
must be in all calls to QSKIP.

Task-number: QTBUG-21851, QTBUG-21652
Change-Id: I8f5d6488637acd5e38d3c8dd418ff3776b2f3778
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>

diff --git a/tests/auto/qxmlquery/tst_qxmlquery.cpp b/tests/auto/qxmlquery/tst_qxmlquery.cpp
index c524282..241a43a 100644 (file)
--- a/tests/auto/qxmlquery/tst_qxmlquery.cpp
+++ b/tests/auto/qxmlquery/tst_qxmlquery.cpp
@@ -1998,7 +1998,7 @@ void tst_QXmlQuery::fnDocNetworkAccessSuccess() const
     QStringList testsToSkip;
     testsToSkip << "http scheme" << "ftp scheme";
     if (testsToSkip.contains(QTest::currentDataTag()))
-        QSKIP("Network tests are currently unsupported on Windows CE.", SkipSingle);
+        QSKIP("Network tests are currently unsupported on Windows CE.");
 #endif
 
     QFETCH(QUrl, uriToOpen);
@@ -2532,7 +2532,7 @@ void tst_QXmlQuery::setQueryQUrlSuccess() const
     QStringList testsToSkip;
     testsToSkip << "A valid query via the ftp scheme" << "A valid query via the http scheme";
     if (testsToSkip.contains(QTest::currentDataTag()))
-        QSKIP("Network tests are currently unsupported on Windows CE.", SkipSingle);
+        QSKIP("Network tests are currently unsupported on Windows CE.");
 #endif
 
     QFETCH(QUrl, queryURI);

diff --git a/tests/auto/xmlpatterns/tst_xmlpatterns.cpp b/tests/auto/xmlpatterns/tst_xmlpatterns.cpp
index c1ff307..6d689b0 100644 (file)
--- a/tests/auto/xmlpatterns/tst_xmlpatterns.cpp
+++ b/tests/auto/xmlpatterns/tst_xmlpatterns.cpp
@@ -121,8 +121,7 @@ void tst_XmlPatterns::initTestCase()
             qPrintable(QString(
                 "The command line tool (%1) could not be run, possibly because Qt was "
                 "incompletely built or installed. No tests will be run."
-            ).arg(m_command)),
-            SkipAll
+            ).arg(m_command))
         );
     }
 
@@ -131,12 +130,12 @@ void tst_XmlPatterns::initTestCase()
 void tst_XmlPatterns::xquerySupport()
 {
     if(m_dontRun)
-        QSKIP("The command line utility is not in the path.", SkipAll);
+        QSKIP("The command line utility is not in the path.");
 
 #ifdef Q_OS_WINCE
-    QSKIP("WinCE: This test uses unsupported WinCE functionality", SkipAll);
+    QSKIP("WinCE: This test uses unsupported WinCE functionality");
 #elif defined(Q_OS_SYMBIAN)
-    QSKIP("Symbian: This test uses unsupported Symbian functionality (QProcess with std streams)", SkipAll);
+    QSKIP("Symbian: This test uses unsupported Symbian functionality (QProcess with std streams)");
 #endif
 
     QFETCH(int,         expectedExitCode);
@@ -854,12 +853,12 @@ void tst_XmlPatterns::xsltSupport()
 void tst_XmlPatterns::xsltSupport_data() const
 {
     if(m_dontRun)
-        QSKIP("The command line utility is not in the path.", SkipAll);
+        QSKIP("The command line utility is not in the path.");
 
 #ifdef Q_OS_WINCE
-    QSKIP("WinCE: This test uses unsupported WinCE functionality", SkipAll);
+    QSKIP("WinCE: This test uses unsupported WinCE functionality");
 #elif defined(Q_OS_SYMBIAN)
-    QSKIP("Symbian: This test uses unsupported Symbian functionality (QProcess with std streams)", SkipAll);
+    QSKIP("Symbian: This test uses unsupported Symbian functionality (QProcess with std streams)");
 #endif
 
     QTest::addColumn<int>("expectedExitCode");

diff --git a/tests/auto/xmlpatternsvalidator/tst_xmlpatternsvalidator.cpp b/tests/auto/xmlpatternsvalidator/tst_xmlpatternsvalidator.cpp
index 29ed77e..d41ba09 100644 (file)
--- a/tests/auto/xmlpatternsvalidator/tst_xmlpatternsvalidator.cpp
+++ b/tests/auto/xmlpatternsvalidator/tst_xmlpatternsvalidator.cpp
@@ -88,8 +88,7 @@ void tst_XmlPatternsValidator::initTestCase()
             qPrintable(QString(
                 "The command line tool (%1) could not be run, possibly because Qt was "
                 "incompletely built or installed. No tests will be run."
-            ).arg(m_command)),
-            SkipAll
+            ).arg(m_command))
         );
     }
 }
@@ -97,10 +96,10 @@ void tst_XmlPatternsValidator::initTestCase()
 void tst_XmlPatternsValidator::xsdSupport()
 {
     if(m_dontRun)
-        QSKIP("The command line utility is not in the path.", SkipAll);
+        QSKIP("The command line utility is not in the path.");
 
 #ifdef Q_OS_WINCE
-    QSKIP("WinCE: This test uses unsupported WinCE functionality", SkipAll);
+    QSKIP("WinCE: This test uses unsupported WinCE functionality");
 #endif
 
     QFETCH(int,         expectedExitCode);

diff --git a/tests/auto/xmlpatternsxqts/tst_suitetest.cpp b/tests/auto/xmlpatternsxqts/tst_suitetest.cpp
index 53541ac..ab48eca 100644 (file)
--- a/tests/auto/xmlpatternsxqts/tst_suitetest.cpp
+++ b/tests/auto/xmlpatternsxqts/tst_suitetest.cpp
@@ -79,7 +79,7 @@ void tst_SuiteTest::initTestCase()
 void tst_SuiteTest::runTestSuite() const
 {
     if(m_abortRun)
-        QSKIP("The test suite is not available, no tests are run.", SkipAll);
+        QSKIP("The test suite is not available, no tests are run.");
 
     QString errMsg;
     const QFileInfo fi(m_catalogPath);
@@ -121,7 +121,7 @@ void tst_SuiteTest::runTestSuite() const
 void tst_SuiteTest::checkTestSuiteResult() const
 {
     if(m_abortRun)
-        QSKIP("This test takes too long time to run on the majority of platforms.", SkipAll);
+        QSKIP("This test takes too long time to run on the majority of platforms.");
 
     typedef QList<QFileInfo> QFileInfoList;
 

diff --git a/tests/auto/xmlpatternsxqts/tst_xmlpatternsxqts.cpp b/tests/auto/xmlpatternsxqts/tst_xmlpatternsxqts.cpp
index adb1f28..11bdc1b 100644 (file)
--- a/tests/auto/xmlpatternsxqts/tst_xmlpatternsxqts.cpp
+++ b/tests/auto/xmlpatternsxqts/tst_xmlpatternsxqts.cpp
@@ -66,7 +66,7 @@ tst_XmlPatternsXQTS::tst_XmlPatternsXQTS() : tst_SuiteTest(tst_SuiteTest::XQuery
 void tst_XmlPatternsXQTS::catalogPath(QString &write) const
 {
     if(dontRun())
-        QSKIP("This test takes too long time to run on the majority of platforms.", SkipAll);
+        QSKIP("This test takes too long time to run on the majority of platforms.");
 
     QProcess p4;