/**************************************************************************** ** ** Copyright (C) 2016 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtCore module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms ** and conditions see https://www.qt.io/terms-conditions. For further ** information use the contact form at https://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser ** General Public License version 3 as published by the Free Software ** Foundation and appearing in the file LICENSE.LGPL3 included in the ** packaging of this file. Please review the following information to ** ensure the GNU Lesser General Public License version 3 requirements ** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. ** ** GNU General Public License Usage ** Alternatively, this file may be used under the terms of the GNU ** General Public License version 2.0 or (at your option) the GNU General ** Public license version 3 or any later version approved by the KDE Free ** Qt Foundation. The licenses are as published by the Free Software ** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 ** included in the packaging of this file. Please review the following ** information to ensure the GNU General Public License requirements will ** be met: https://www.gnu.org/licenses/gpl-2.0.html and ** https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** ****************************************************************************/ #ifndef QTCONCURRENT_FILTERKERNEL_H #define QTCONCURRENT_FILTERKERNEL_H #include #if !defined(QT_NO_CONCURRENT) || defined (Q_CLANG_QDOC) #include #include #include QT_BEGIN_NAMESPACE namespace QtConcurrent { template struct qValueType { typedef typename T::value_type value_type; }; template struct qValueType { typedef T value_type; }; template struct qValueType { typedef T value_type; }; // Implementation of filter template class FilterKernel : public IterateKernel { typedef ReduceKernel Reducer; typedef IterateKernel IterateKernelType; typedef typename ReduceFunctor::result_type T; Sequence reducedResult; Sequence &sequence; KeepFunctor keep; ReduceFunctor reduce; Reducer reducer; public: FilterKernel(Sequence &_sequence, KeepFunctor _keep, ReduceFunctor _reduce) : IterateKernelType(const_cast(_sequence).begin(), const_cast(_sequence).end()), reducedResult(), sequence(_sequence), keep(_keep), reduce(_reduce), reducer(OrderedReduce) { } bool runIteration(typename Sequence::const_iterator it, int index, T *) override { IntermediateResults results; results.begin = index; results.end = index + 1; if (keep(*it)) results.vector.append(*it); reducer.runReduce(reduce, reducedResult, results); return false; } bool runIterations(typename Sequence::const_iterator sequenceBeginIterator, int begin, int end, T *) override { IntermediateResults results; results.begin = begin; results.end = end; results.vector.reserve(end - begin); typename Sequence::const_iterator it = sequenceBeginIterator; std::advance(it, begin); for (int i = begin; i < end; ++i) { if (keep(*it)) results.vector.append(*it); std::advance(it, 1); } reducer.runReduce(reduce, reducedResult, results); return false; } void finish() override { reducer.finish(reduce, reducedResult); sequence = reducedResult; } inline bool shouldThrottleThread() override { return IterateKernelType::shouldThrottleThread() || reducer.shouldThrottle(); } inline bool shouldStartThread() override { return IterateKernelType::shouldStartThread() && reducer.shouldStartThread(); } typedef void ReturnType; typedef void ResultType; }; // Implementation of filter-reduce template ::value_type> > class FilteredReducedKernel : public IterateKernel { ReducedResultType reducedResult; KeepFunctor keep; ReduceFunctor reduce; Reducer reducer; typedef IterateKernel IterateKernelType; public: FilteredReducedKernel(Iterator begin, Iterator end, KeepFunctor _keep, ReduceFunctor _reduce, ReduceOptions reduceOption) : IterateKernelType(begin, end), reducedResult(), keep(_keep), reduce(_reduce), reducer(reduceOption) { } #if 0 FilteredReducedKernel(ReducedResultType initialValue, KeepFunctor keep, ReduceFunctor reduce, ReduceOption reduceOption) : reducedResult(initialValue), keep(keep), reduce(reduce), reducer(reduceOption) { } #endif bool runIteration(Iterator it, int index, ReducedResultType *) override { IntermediateResults::value_type> results; results.begin = index; results.end = index + 1; if (keep(*it)) results.vector.append(*it); reducer.runReduce(reduce, reducedResult, results); return false; } bool runIterations(Iterator sequenceBeginIterator, int begin, int end, ReducedResultType *) override { IntermediateResults::value_type> results; results.begin = begin; results.end = end; results.vector.reserve(end - begin); Iterator it = sequenceBeginIterator; std::advance(it, begin); for (int i = begin; i < end; ++i) { if (keep(*it)) results.vector.append(*it); std::advance(it, 1); } reducer.runReduce(reduce, reducedResult, results); return false; } void finish() override { reducer.finish(reduce, reducedResult); } inline bool shouldThrottleThread() override { return IterateKernelType::shouldThrottleThread() || reducer.shouldThrottle(); } inline bool shouldStartThread() override { return IterateKernelType::shouldStartThread() && reducer.shouldStartThread(); } typedef ReducedResultType ReturnType; typedef ReducedResultType ResultType; ReducedResultType *result() override { return &reducedResult; } }; // Implementation of filter that reports individual results via QFutureInterface template class FilteredEachKernel : public IterateKernel::value_type> { typedef typename qValueType::value_type T; typedef IterateKernel IterateKernelType; KeepFunctor keep; public: typedef T ReturnType; typedef T ResultType; FilteredEachKernel(Iterator begin, Iterator end, KeepFunctor _keep) : IterateKernelType(begin, end), keep(_keep) { } void start() override { if (this->futureInterface) this->futureInterface->setFilterMode(true); IterateKernelType::start(); } bool runIteration(Iterator it, int index, T *) override { if (keep(*it)) this->reportResult(&(*it), index); else this->reportResult(0, index); return false; } bool runIterations(Iterator sequenceBeginIterator, int begin, int end, T *) override { const int count = end - begin; IntermediateResults::value_type> results; results.begin = begin; results.end = end; results.vector.reserve(count); Iterator it = sequenceBeginIterator; std::advance(it, begin); for (int i = begin; i < end; ++i) { if (keep(*it)) results.vector.append(*it); std::advance(it, 1); } this->reportResults(results.vector, begin, count); return false; } }; //! [QtConcurrent-2] template inline ThreadEngineStarter::value_type> startFiltered(Iterator begin, Iterator end, KeepFunctor functor) { return startThreadEngine(new FilteredEachKernel(begin, end, functor)); } //! [QtConcurrent-3] template inline ThreadEngineStarter startFiltered(const Sequence &sequence, KeepFunctor functor) { typedef SequenceHolder1, KeepFunctor> SequenceHolderType; return startThreadEngine(new SequenceHolderType(sequence, functor)); } //! [QtConcurrent-4] template inline ThreadEngineStarter startFilteredReduced(const Sequence & sequence, MapFunctor mapFunctor, ReduceFunctor reduceFunctor, ReduceOptions options) { typedef typename Sequence::const_iterator Iterator; typedef ReduceKernel::value_type > Reducer; typedef FilteredReducedKernel FilteredReduceType; typedef SequenceHolder2 SequenceHolderType; return startThreadEngine(new SequenceHolderType(sequence, mapFunctor, reduceFunctor, options)); } //! [QtConcurrent-5] template inline ThreadEngineStarter startFilteredReduced(Iterator begin, Iterator end, MapFunctor mapFunctor, ReduceFunctor reduceFunctor, ReduceOptions options) { typedef ReduceKernel::value_type> Reducer; typedef FilteredReducedKernel FilteredReduceType; return startThreadEngine(new FilteredReduceType(begin, end, mapFunctor, reduceFunctor, options)); } } // namespace QtConcurrent QT_END_NAMESPACE #endif // QT_NO_CONCURRENT #endif 3823fa2206fe2c9a9'>tests/auto/testlib/selftests/expected_globaldata.xunitxml8
-rw-r--r--tests/auto/testlib/selftests/expected_singleskip.txt2
-rw-r--r--tests/auto/testlib/selftests/expected_skipinit.txt2
-rw-r--r--tests/auto/testlib/selftests/expected_skipinitdata.lightxml2
-rw-r--r--tests/auto/testlib/selftests/expected_skipinitdata.txt4
-rw-r--r--tests/auto/testlib/selftests/expected_skipinitdata.xml2
-rw-r--r--tests/auto/testlib/selftests/expected_skipinitdata.xunitxml4
-rw-r--r--tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp6
-rw-r--r--tests/auto/testlib/selftests/singleskip/tst_singleskip.cpp2
-rw-r--r--tests/auto/testlib/selftests/skip/tst_skip.cpp6
-rw-r--r--tests/auto/testlib/selftests/skipinit/tst_skipinit.cpp2
-rw-r--r--tests/auto/testlib/selftests/skipinitdata/tst_skipinitdata.cpp2
-rw-r--r--tests/auto/testlib/selftests/xunit/tst_xunit.cpp2
18 files changed, 56 insertions, 22 deletions
diff --git a/tests/auto/testlib/selftests/benchlibcallgrind/tst_benchlibcallgrind.cpp b/tests/auto/testlib/selftests/benchlibcallgrind/tst_benchlibcallgrind.cpp
index 3505496829..1199462c99 100644
--- a/tests/auto/testlib/selftests/benchlibcallgrind/tst_benchlibcallgrind.cpp
+++ b/tests/auto/testlib/selftests/benchlibcallgrind/tst_benchlibcallgrind.cpp
@@ -76,7 +76,7 @@ void tst_BenchlibCallgrind::failInChildProcess()
void tst_BenchlibCallgrind::twoHundredMillionInstructions()
{
#if !defined(__GNUC__) || !defined(__i386)
- QSKIP("This test is only defined for gcc and x86.", SkipAll);
+ QSKIP("This test is only defined for gcc and x86.");
#else
QBENCHMARK {
__asm__ __volatile__(
diff --git a/tests/auto/testlib/selftests/benchlibtickcounter/tst_benchlibtickcounter.cpp b/tests/auto/testlib/selftests/benchlibtickcounter/tst_benchlibtickcounter.cpp
index cc8b3a454f..9e274edea5 100644
--- a/tests/auto/testlib/selftests/benchlibtickcounter/tst_benchlibtickcounter.cpp
+++ b/tests/auto/testlib/selftests/benchlibtickcounter/tst_benchlibtickcounter.cpp
@@ -56,7 +56,7 @@ private slots:
void tst_BenchlibTickCounter::threeBillionTicks()
{
#ifndef HAVE_TICK_COUNTER
- QSKIP("Tick counter not available on this platform", SkipAll);
+ QSKIP("Tick counter not available on this platform");
#else
QBENCHMARK {
CycleCounterTicks start = getticks();
diff --git a/tests/auto/testlib/selftests/expected_globaldata.lightxml b/tests/auto/testlib/selftests/expected_globaldata.lightxml
index b8208aa481..7a50f01cb8 100644
--- a/tests/auto/testlib/selftests/expected_globaldata.lightxml
+++ b/tests/auto/testlib/selftests/expected_globaldata.lightxml
@@ -94,6 +94,18 @@
<DataTag><![CDATA[1:local 1]]></DataTag>
<Description><![CDATA[cleanup skipLocal local 1 ]]></Description>
</Message>
+<Message type="qdebug" file="" line="0">
+ <DataTag><![CDATA[1:local 2]]></DataTag>
+ <Description><![CDATA[init skipLocal local 2 ]]></Description>
+</Message>
+<Message type="skip" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp" line="149">
+ <DataTag><![CDATA[1:local 2]]></DataTag>
+ <Description><![CDATA[skipping]]></Description>
+</Message>
+<Message type="qdebug" file="" line="0">
+ <DataTag><![CDATA[1:local 2]]></DataTag>
+ <Description><![CDATA[cleanup skipLocal local 2 ]]></Description>
+</Message>
</TestFunction>
<TestFunction name="skipSingle">
<Message type="qdebug" file="" line="0">
diff --git a/tests/auto/testlib/selftests/expected_globaldata.txt b/tests/auto/testlib/selftests/expected_globaldata.txt
index efd8272d5c..e3905e2fa3 100644
--- a/tests/auto/testlib/selftests/expected_globaldata.txt
+++ b/tests/auto/testlib/selftests/expected_globaldata.txt
@@ -25,6 +25,10 @@ QDEBUG : tst_globaldata::skipLocal(1:local 1) init skipLocal local 1
SKIP : tst_globaldata::skipLocal(1:local 1) skipping
Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp(149)]
QDEBUG : tst_globaldata::skipLocal(1:local 1) cleanup skipLocal local 1
+QDEBUG : tst_globaldata::skipLocal(1:local 2) init skipLocal local 2
+SKIP : tst_globaldata::skipLocal(1:local 2) skipping
+ Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp(149)]
+QDEBUG : tst_globaldata::skipLocal(1:local 2) cleanup skipLocal local 2
QDEBUG : tst_globaldata::skipSingle(1:local 1) init skipSingle local 1
QDEBUG : tst_globaldata::skipSingle(1:local 1) global: false local: false
QDEBUG : tst_globaldata::skipSingle(1:local 1) cleanup skipSingle local 1
@@ -41,5 +45,5 @@ QDEBUG : tst_globaldata::skipSingle(2:local 2) cleanup skipSingle local 2
PASS : tst_globaldata::skipSingle()
QDEBUG : tst_globaldata::cleanupTestCase() cleanupTestCase cleanupTestCase (null)
PASS : tst_globaldata::cleanupTestCase()
-Totals: 4 passed, 0 failed, 3 skipped
+Totals: 4 passed, 0 failed, 4 skipped
********* Finished testing of tst_globaldata *********
diff --git a/tests/auto/testlib/selftests/expected_globaldata.xml b/tests/auto/testlib/selftests/expected_globaldata.xml
index e0c69475d6..9abbeeef35 100644
--- a/tests/auto/testlib/selftests/expected_globaldata.xml
+++ b/tests/auto/testlib/selftests/expected_globaldata.xml
@@ -96,6 +96,18 @@
<DataTag><![CDATA[1:local 1]]></DataTag>
<Description><![CDATA[cleanup skipLocal local 1 ]]></Description>
</Message>
+<Message type="qdebug" file="" line="0">
+ <DataTag><![CDATA[1:local 2]]></DataTag>
+ <Description><![CDATA[init skipLocal local 2 ]]></Description>
+</Message>
+<Message type="skip" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp" line="149">
+ <DataTag><![CDATA[1:local 2]]></DataTag>
+ <Description><![CDATA[skipping]]></Description>
+</Message>
+<Message type="qdebug" file="" line="0">
+ <DataTag><![CDATA[1:local 2]]></DataTag>
+ <Description><![CDATA[cleanup skipLocal local 2 ]]></Description>
+</Message>
</TestFunction>
<TestFunction name="skipSingle">
<Message type="qdebug" file="" line="0">
diff --git a/tests/auto/testlib/selftests/expected_globaldata.xunitxml b/tests/auto/testlib/selftests/expected_globaldata.xunitxml
index eade59734f..9e0cd149dc 100644
--- a/tests/auto/testlib/selftests/expected_globaldata.xunitxml
+++ b/tests/auto/testlib/selftests/expected_globaldata.xunitxml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<testsuite errors="34" failures="0" tests="6" name="tst_globaldata">
+<testsuite errors="37" failures="0" tests="6" name="tst_globaldata">
<properties>
<property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/>
<property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/>
@@ -32,6 +32,9 @@
<!-- tag="1:local 1" message="init skipLocal local 1 " type="qdebug" -->
<!-- tag="1:local 1" message="skipping" type="skip" -->
<!-- tag="1:local 1" message="cleanup skipLocal local 1 " type="qdebug" -->
+ <!-- tag="1:local 2" message="init skipLocal local 2 " type="qdebug" -->
+ <!-- tag="1:local 2" message="skipping" type="skip" -->
+ <!-- tag="1:local 2" message="cleanup skipLocal local 2 " type="qdebug" -->
</testcase>
<testcase result="pass" name="skipSingle">
<!-- tag="1:local 1" message="init skipSingle local 1 " type="qdebug" -->
@@ -72,6 +75,9 @@
<![CDATA[init skipLocal local 1 ]]>
<![CDATA[skipping]]>
<![CDATA[cleanup skipLocal local 1 ]]>
+<![CDATA[init skipLocal local 2 ]]>
+<![CDATA[skipping]]>
+<![CDATA[cleanup skipLocal local 2 ]]>
<![CDATA[init skipSingle local 1 ]]>
<![CDATA[global: false local: false ]]>
<![CDATA[cleanup skipSingle local 1 ]]>
diff --git a/tests/auto/testlib/selftests/expected_singleskip.txt b/tests/auto/testlib/selftests/expected_singleskip.txt
index 1e54c469b4..b9085b1cbd 100644
--- a/tests/auto/testlib/selftests/expected_singleskip.txt
+++ b/tests/auto/testlib/selftests/expected_singleskip.txt
@@ -2,7 +2,7 @@
Config: Using QTest library @INSERT_QT_VERSION_HERE@, Qt @INSERT_QT_VERSION_HERE@
PASS : tst_SingleSkip::initTestCase()
SKIP : tst_SingleSkip::myTest() skipping test
- Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/singleskip/tst_singleskip.cpp(23)]
+ Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/singleskip/tst_singleskip.cpp(56)]
PASS : tst_SingleSkip::cleanupTestCase()
Totals: 2 passed, 0 failed, 1 skipped
********* Finished testing of tst_SingleSkip *********
diff --git a/tests/auto/testlib/selftests/expected_skipinit.txt b/tests/auto/testlib/selftests/expected_skipinit.txt
index a8b4f8ea94..a86060fa5a 100644
--- a/tests/auto/testlib/selftests/expected_skipinit.txt
+++ b/tests/auto/testlib/selftests/expected_skipinit.txt
@@ -1,7 +1,7 @@
********* Start testing of tst_SkipInit *********
Config: Using QTest library @INSERT_QT_VERSION_HERE@, Qt @INSERT_QT_VERSION_HERE@
SKIP : tst_SkipInit::initTestCase() Skip inside initTestCase. This should skip all tests in the class.
- Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/skipinit/tst_skipinit.cpp(22)]
+ Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/skipinit/tst_skipinit.cpp(55)]
PASS : tst_SkipInit::cleanupTestCase()
Totals: 1 passed, 0 failed, 1 skipped
********* Finished testing of tst_SkipInit *********
diff --git a/tests/auto/testlib/selftests/expected_skipinitdata.lightxml b/tests/auto/testlib/selftests/expected_skipinitdata.lightxml
index e933b7157d..cd820240fd 100644
--- a/tests/auto/testlib/selftests/expected_skipinitdata.lightxml
+++ b/tests/auto/testlib/selftests/expected_skipinitdata.lightxml
@@ -4,6 +4,6 @@
</Environment>
<TestFunction name="initTestCase">
<Message type="skip" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/skipinitdata/tst_skipinitdata.cpp" line="56">
- <Description><![CDATA[Skip inside initTestCase. This should skip all tests in the class.]]></Description>
+ <Description><![CDATA[Skip inside initTestCase_data. This should skip all tests in the class.]]></Description>
</Message>
</TestFunction>
diff --git a/tests/auto/testlib/selftests/expected_skipinitdata.txt b/tests/auto/testlib/selftests/expected_skipinitdata.txt
index 8640855497..a4cbbea194 100644
--- a/tests/auto/testlib/selftests/expected_skipinitdata.txt
+++ b/tests/auto/testlib/selftests/expected_skipinitdata.txt
@@ -1,6 +1,6 @@
********* Start testing of tst_SkipInitData *********
Config: Using QTest library @INSERT_QT_VERSION_HERE@, Qt @INSERT_QT_VERSION_HERE@
-SKIP : tst_SkipInitData::initTestCase() Skip inside initTestCase. This should skip all tests in the class.
- Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/skipinitdata/tst_skipinitdata.cpp(23)]
+SKIP : tst_SkipInitData::initTestCase() Skip inside initTestCase_data. This should skip all tests in the class.
+ Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/skipinitdata/tst_skipinitdata.cpp(56)]
Totals: 0 passed, 0 failed, 1 skipped
********* Finished testing of tst_SkipInitData *********
diff --git a/tests/auto/testlib/selftests/expected_skipinitdata.xml b/tests/auto/testlib/selftests/expected_skipinitdata.xml
index 7ad34d913f..8371700547 100644
--- a/tests/auto/testlib/selftests/expected_skipinitdata.xml
+++ b/tests/auto/testlib/selftests/expected_skipinitdata.xml
@@ -6,7 +6,7 @@
</Environment>
<TestFunction name="initTestCase">
<Message type="skip" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/skipinitdata/tst_skipinitdata.cpp" line="56">
- <Description><![CDATA[Skip inside initTestCase. This should skip all tests in the class.]]></Description>
+ <Description><![CDATA[Skip inside initTestCase_data. This should skip all tests in the class.]]></Description>
</Message>
</TestFunction>
</TestCase>
diff --git a/tests/auto/testlib/selftests/expected_skipinitdata.xunitxml b/tests/auto/testlib/selftests/expected_skipinitdata.xunitxml
index 93967eb055..699d50f7a7 100644
--- a/tests/auto/testlib/selftests/expected_skipinitdata.xunitxml
+++ b/tests/auto/testlib/selftests/expected_skipinitdata.xunitxml
@@ -5,9 +5,9 @@
<property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/>
</properties>
<testcase name="initTestCase">
- <!-- message="Skip inside initTestCase. This should skip all tests in the class." type="skip" -->
+ <!-- message="Skip inside initTestCase_data. This should skip all tests in the class." type="skip" -->
</testcase>
<system-err>
-<![CDATA[Skip inside initTestCase. This should skip all tests in the class.]]>
+<![CDATA[Skip inside initTestCase_data. This should skip all tests in the class.]]>
</system-err>
</testsuite>
diff --git a/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp b/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp
index 18b91ccfe5..898cccf435 100644
--- a/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp
+++ b/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp
@@ -126,7 +126,7 @@ void tst_globaldata::skip_data()
QTest::newRow("local 1") << false;
QTest::newRow("local 2") << true;
- QSKIP("skipping", SkipAll);
+ QSKIP("skipping");
}
void tst_globaldata::skip()
@@ -140,13 +140,13 @@ void tst_globaldata::skipSingle()
QFETCH(bool, booll);
if (booli && !booll)
- QSKIP("skipping", SkipSingle);
+ QSKIP("skipping");
qDebug() << "global:" << booli << "local:" << booll;
}
void tst_globaldata::skipLocal()
{
- QSKIP("skipping", SkipAll);
+ QSKIP("skipping");
}
QTEST_MAIN(tst_globaldata)
diff --git a/tests/auto/testlib/selftests/singleskip/tst_singleskip.cpp b/tests/auto/testlib/selftests/singleskip/tst_singleskip.cpp
index 5567b88022..7701eb81a0 100644
--- a/tests/auto/testlib/selftests/singleskip/tst_singleskip.cpp
+++ b/tests/auto/testlib/selftests/singleskip/tst_singleskip.cpp
@@ -53,7 +53,7 @@ private slots:
void tst_SingleSkip::myTest() const
{
- QSKIP("skipping test", SkipAll);
+ QSKIP("skipping test");
}
QTEST_MAIN(tst_SingleSkip)
diff --git a/tests/auto/testlib/selftests/skip/tst_skip.cpp b/tests/auto/testlib/selftests/skip/tst_skip.cpp
index b5b53884b7..905fe2dde4 100644
--- a/tests/auto/testlib/selftests/skip/tst_skip.cpp
+++ b/tests/auto/testlib/selftests/skip/tst_skip.cpp
@@ -65,7 +65,7 @@ void tst_Skip::test_data()
QTest::newRow("local 1") << false;
QTest::newRow("local 2") << true;
- QSKIP("skipping all", SkipAll);
+ QSKIP("skipping all");
}
void tst_Skip::test()
@@ -75,7 +75,7 @@ void tst_Skip::test()
void tst_Skip::emptytest_data()
{
- QSKIP("skipping all", SkipAll);
+ QSKIP("skipping all");
}
void tst_Skip::emptytest()
@@ -94,7 +94,7 @@ void tst_Skip::singleSkip()
{
QFETCH(bool, booll);
if (!booll)
- QSKIP("skipping one", SkipSingle);
+ QSKIP("skipping one");
qDebug("this line should only be reached once (%s)", booll ? "true" : "false");
}
diff --git a/tests/auto/testlib/selftests/skipinit/tst_skipinit.cpp b/tests/auto/testlib/selftests/skipinit/tst_skipinit.cpp
index 4cd882f747..1a9fc1eeec 100644
--- a/tests/auto/testlib/selftests/skipinit/tst_skipinit.cpp
+++ b/tests/auto/testlib/selftests/skipinit/tst_skipinit.cpp
@@ -52,7 +52,7 @@ private slots:
void tst_SkipInit::initTestCase() const
{
- QSKIP("Skip inside initTestCase. This should skip all tests in the class.", SkipAll);
+ QSKIP("Skip inside initTestCase. This should skip all tests in the class.");
}
/*! \internal
diff --git a/tests/auto/testlib/selftests/skipinitdata/tst_skipinitdata.cpp b/tests/auto/testlib/selftests/skipinitdata/tst_skipinitdata.cpp
index fb97fc978d..b09e99b32f 100644
--- a/tests/auto/testlib/selftests/skipinitdata/tst_skipinitdata.cpp
+++ b/tests/auto/testlib/selftests/skipinitdata/tst_skipinitdata.cpp
@@ -53,7 +53,7 @@ private slots:
void tst_SkipInitData::initTestCase_data() const
{
- QSKIP("Skip inside initTestCase. This should skip all tests in the class.", SkipAll);
+ QSKIP("Skip inside initTestCase_data. This should skip all tests in the class.");
}
void tst_SkipInitData::initTestCase() const
diff --git a/tests/auto/testlib/selftests/xunit/tst_xunit.cpp b/tests/auto/testlib/selftests/xunit/tst_xunit.cpp
index 8f2f712426..05acc8cfe7 100644
--- a/tests/auto/testlib/selftests/xunit/tst_xunit.cpp
+++ b/tests/auto/testlib/selftests/xunit/tst_xunit.cpp
@@ -76,7 +76,7 @@ void tst_Xunit::testFunc2()
void tst_Xunit::testFunc3()
{
- QSKIP("skipping this function!", SkipAll);
+ QSKIP("skipping this function!");
}
void tst_Xunit::testFunc4()