summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/testlib/qtestcase.cpp2
-rw-r--r--src/testlib/qtestlog.cpp3
-rw-r--r--src/testlib/qtestlog_p.h3
-rw-r--r--src/testlib/qtestresult.cpp5
-rw-r--r--src/testlib/qtestresult_p.h3
5 files changed, 6 insertions, 10 deletions
diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp
index c63d333261..9c50257b44 100644
--- a/src/testlib/qtestcase.cpp
+++ b/src/testlib/qtestcase.cpp
@@ -1959,7 +1959,7 @@ bool QTest::qVerify(bool statement, const char *statementStr, const char *descri
void QTest::qSkip(const char *message, QTest::SkipMode mode,
const char *file, int line)
{
- QTestResult::addSkip(message, mode, file, line);
+ QTestResult::addSkip(message, file, line);
if (mode == QTest::SkipAll)
QTestResult::setSkipCurrentTest(true);
}
diff --git a/src/testlib/qtestlog.cpp b/src/testlib/qtestlog.cpp
index 674772f95b..a13bcdc7f8 100644
--- a/src/testlib/qtestlog.cpp
+++ b/src/testlib/qtestlog.cpp
@@ -275,8 +275,7 @@ void QTestLog::addXPass(const char *msg, const char *file, int line)
QTest::testLogger->addIncident(QAbstractTestLogger::XPass, msg, file, line);
}
-void QTestLog::addSkip(const char *msg, QTest::SkipMode /*mode*/,
- const char *file, int line)
+void QTestLog::addSkip(const char *msg, const char *file, int line)
{
QTEST_ASSERT(QTest::testLogger);
QTEST_ASSERT(msg);
diff --git a/src/testlib/qtestlog_p.h b/src/testlib/qtestlog_p.h
index ee94404744..006b3ac12f 100644
--- a/src/testlib/qtestlog_p.h
+++ b/src/testlib/qtestlog_p.h
@@ -72,8 +72,7 @@ public:
static void addFail(const char *msg, const char *file, int line);
static void addXFail(const char *msg, const char *file, int line);
static void addXPass(const char *msg, const char *file, int line);
- static void addSkip(const char *msg, QTest::SkipMode mode,
- const char *file, int line);
+ static void addSkip(const char *msg, const char *file, int line);
static void addBenchmarkResult(const QBenchmarkResult &result);
static void addIgnoreMessage(QtMsgType type, const char *msg);
static int unhandledIgnoreMessages();
diff --git a/src/testlib/qtestresult.cpp b/src/testlib/qtestresult.cpp
index 7fb0208bb3..4a6764b115 100644
--- a/src/testlib/qtestresult.cpp
+++ b/src/testlib/qtestresult.cpp
@@ -285,12 +285,11 @@ void QTestResult::addFailure(const char *message, const char *file, int line)
++QTest::fails;
}
-void QTestResult::addSkip(const char *message, QTest::SkipMode mode,
- const char *file, int line)
+void QTestResult::addSkip(const char *message, const char *file, int line)
{
clearExpectFail();
- QTestLog::addSkip(message, mode, file, line);
+ QTestLog::addSkip(message, file, line);
++QTest::skips;
}
diff --git a/src/testlib/qtestresult_p.h b/src/testlib/qtestresult_p.h
index a3e265ffac..1ce81854b5 100644
--- a/src/testlib/qtestresult_p.h
+++ b/src/testlib/qtestresult_p.h
@@ -93,8 +93,7 @@ public:
static void setCurrentTestFunction(const char *func);
static void setCurrentTestLocation(TestLocation loc);
static void setCurrentTestObject(const char *name);
- static void addSkip(const char *message, QTest::SkipMode mode,
- const char *file, int line);
+ static void addSkip(const char *message, const char *file, int line);
static bool expectFail(const char *dataIndex, const char *comment,
QTest::TestFailMode mode, const char *file, int line);
static bool verify(bool statement, const char *statementStr, const char *extraInfo,