diff options
Diffstat (limited to 'src/testlib')
| -rw-r--r-- | src/testlib/qplaintestlogger.cpp | 16 | ||||
| -rw-r--r-- | src/testlib/qtestcase.cpp | 8 | ||||
| -rw-r--r-- | src/testlib/testlib.pro | 1 |
3 files changed, 16 insertions, 9 deletions
diff --git a/src/testlib/qplaintestlogger.cpp b/src/testlib/qplaintestlogger.cpp index bd4f26b493..2f87e08c3c 100644 --- a/src/testlib/qplaintestlogger.cpp +++ b/src/testlib/qplaintestlogger.cpp @@ -251,7 +251,6 @@ void QPlainTestLogger::printMessage(const char *type, const char *msg, const cha outputMessage(buf.data()); } -//void QPlainTestLogger::printBenchmarkResult(const char *bmtag, int value, int iterations) void QPlainTestLogger::printBenchmarkResult(const QBenchmarkResult &result) { const char *bmtag = QTest::benchmarkResult2String(); @@ -372,8 +371,9 @@ void QPlainTestLogger::leaveTestFunction() void QPlainTestLogger::addIncident(IncidentTypes type, const char *description, const char *file, int line) { - // suppress PASS in silent mode - if (type == QAbstractTestLogger::Pass && QTestLog::verboseLevel() < 0) + // suppress PASS and XFAIL in silent mode + if ((type == QAbstractTestLogger::Pass || type == QAbstractTestLogger::XFail) + && QTestLog::verboseLevel() < 0) return; printMessage(QTest::incidentType2String(type), description, file, line); @@ -381,16 +381,18 @@ void QPlainTestLogger::addIncident(IncidentTypes type, const char *description, void QPlainTestLogger::addBenchmarkResult(const QBenchmarkResult &result) { -// printBenchmarkResult(QTest::benchmarkResult2String(), value, iterations); + // suppress benchmark results in silent mode + if (QTestLog::verboseLevel() < 0) + return; + printBenchmarkResult(result); } void QPlainTestLogger::addMessage(MessageTypes type, const char *message, const char *file, int line) { - // suppress PASS in silent mode - if ((type == QAbstractTestLogger::Skip || type == QAbstractTestLogger::Info) - && QTestLog::verboseLevel() < 0) + // suppress non-fatal messages in silent mode + if (type != QAbstractTestLogger::QFatal && QTestLog::verboseLevel() < 0) return; printMessage(QTest::messageType2String(type), message, file, line); diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp index e867b9629a..a4f1a39bbd 100644 --- a/src/testlib/qtestcase.cpp +++ b/src/testlib/qtestcase.cpp @@ -166,6 +166,7 @@ QT_BEGIN_NAMESPACE */ /*! \macro QTRY_VERIFY_WITH_TIMEOUT(condition, timeout) + \since 5.0 \relates QTest @@ -183,6 +184,7 @@ QT_BEGIN_NAMESPACE /*! \macro QTRY_VERIFY(condition) + \since 5.0 \relates QTest @@ -195,6 +197,7 @@ QT_BEGIN_NAMESPACE */ /*! \macro QTRY_COMPARE_WITH_TIMEOUT(actual, expected, timeout) + \since 5.0 \relates QTest @@ -211,6 +214,7 @@ QT_BEGIN_NAMESPACE */ /*! \macro QTRY_COMPARE(actual, expected) + \since 5.0 \relates QTest @@ -360,6 +364,7 @@ QT_BEGIN_NAMESPACE */ /*! \macro QFINDTESTDATA(filename) + \since 5.0 \relates QTest @@ -449,6 +454,7 @@ QT_BEGIN_NAMESPACE */ /*! \macro QTEST_GUILESS_MAIN(TestClass) + \since 5.0 \relates QTest @@ -1186,7 +1192,7 @@ Q_TESTLIB_EXPORT void qtest_qParseArgs(int argc, char *argv[], bool qml) " *** If no output format is specified, -txt is assumed.\n" "\n" " Detail options:\n" - " -silent : Only outputs warnings and failures\n" + " -silent : Only output failures and fatal errors in plain text output\n" " -v1 : Print enter messages for each testfunction\n" " -v2 : Also print out each QVERIFY/QCOMPARE/QTEST\n" " -vs : Print every signal emitted\n" diff --git a/src/testlib/testlib.pro b/src/testlib/testlib.pro index 26769f95db..2f5b3229e4 100644 --- a/src/testlib/testlib.pro +++ b/src/testlib/testlib.pro @@ -13,7 +13,6 @@ unix:!embedded:QMAKE_PKGCONFIG_DESCRIPTION = Qt \ Testing \ Library -# Input HEADERS = qbenchmark.h \ qsignalspy.h \ qtestaccessible.h \ |