diff options
Diffstat (limited to 'src/testlib/qplaintestlogger.cpp')
-rw-r--r-- | src/testlib/qplaintestlogger.cpp | 31 |
1 files changed, 22 insertions, 9 deletions
diff --git a/src/testlib/qplaintestlogger.cpp b/src/testlib/qplaintestlogger.cpp index 39580f22d4..74f0290f38 100644 --- a/src/testlib/qplaintestlogger.cpp +++ b/src/testlib/qplaintestlogger.cpp @@ -51,21 +51,29 @@ #include <stdlib.h> #include <string.h> -#ifdef Q_OS_WIN -#include <windows.h> -#endif - #ifdef Q_OS_WINCE #include <QtCore/QString> #endif +#ifdef min // windows.h without NOMINMAX is included by the benchmark headers. +# undef min +#endif +#ifdef max +# undef max +#endif + #include <QtCore/QByteArray> #include <QtCore/qmath.h> +#include <QtCore/QLibraryInfo> #ifdef Q_OS_ANDROID # include <android/log.h> #endif +#ifdef Q_OS_WIN +# include <qt_windows.h> +#endif + QT_BEGIN_NAMESPACE namespace QTest { @@ -81,6 +89,10 @@ namespace QTest { return "FAIL! "; case QAbstractTestLogger::XPass: return "XPASS "; + case QAbstractTestLogger::BlacklistedPass: + return "BPASS "; + case QAbstractTestLogger::BlacklistedFail: + return "BFAIL "; } return "??????"; } @@ -334,7 +346,7 @@ void QPlainTestLogger::startLogging() qsnprintf(buf, sizeof(buf), "********* Start testing of %s *********\n" "Config: Using QtTest library " QTEST_VERSION_STR - ", Qt %s\n", QTestResult::currentTestObjectName(), qVersion()); + ", %s\n", QTestResult::currentTestObjectName(), QLibraryInfo::build()); } outputMessage(buf); } @@ -343,15 +355,16 @@ void QPlainTestLogger::stopLogging() { char buf[1024]; if (QTestLog::verboseLevel() < 0) { - qsnprintf(buf, sizeof(buf), "Totals: %d passed, %d failed, %d skipped\n", + qsnprintf(buf, sizeof(buf), "Totals: %d passed, %d failed, %d skipped, %d blacklisted\n", QTestLog::passCount(), QTestLog::failCount(), - QTestLog::skipCount()); + QTestLog::skipCount(), QTestLog::blacklistCount()); } else { qsnprintf(buf, sizeof(buf), - "Totals: %d passed, %d failed, %d skipped\n" + "Totals: %d passed, %d failed, %d skipped, %d blacklisted\n" "********* Finished testing of %s *********\n", QTestLog::passCount(), QTestLog::failCount(), - QTestLog::skipCount(), QTestResult::currentTestObjectName()); + QTestLog::skipCount(), QTestLog::blacklistCount(), + QTestResult::currentTestObjectName()); } outputMessage(buf); |