1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

testlib: Let logger report whether it is logging to stdout

Browse Source 
Change-Id: I7df61b4fdc8c431a73c4b399e2f620923a7c7217
Reviewed-by: Simon Hausmann <hausmann@gmail.com>
This commit is contained in:
Tor Arne Vestbø 2020-10-30 12:05:02 +01:00
parent 04549f68ab
commit 81957e753e
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/testlib/qabstracttestlogger.cpp
View File

@ -90,6 +90,11 @@ QAbstractTestLogger::~QAbstractTestLogger()
stream = nullptr; stream = nullptr;
} }
bool QAbstractTestLogger::isLoggingToStdout() const
{
return stream == stdout;
}
void QAbstractTestLogger::filterUnprintable(char *str) const void QAbstractTestLogger::filterUnprintable(char *str) const
{ {
unsigned char *idx = reinterpret_cast<unsigned char *>(str); unsigned char *idx = reinterpret_cast<unsigned char *>(str);

2
src/testlib/qabstracttestlogger_p.h
View File

@ -106,6 +106,8 @@ public:
virtual void addMessage(MessageTypes type, const QString &message, virtual void addMessage(MessageTypes type, const QString &message,
const char *file = nullptr, int line = 0) = 0; const char *file = nullptr, int line = 0) = 0;
bool isLoggingToStdout() const;
void outputString(const char *msg); void outputString(const char *msg);
protected: protected:

11
src/testlib/qtestlog.cpp
View File

@ -169,7 +169,6 @@ namespace QTest {
static IgnoreResultList *ignoreResultList = nullptr; static IgnoreResultList *ignoreResultList = nullptr;
static QList<QAbstractTestLogger *> loggers; static QList<QAbstractTestLogger *> loggers;
static bool loggerUsingStdout = false;
static int verbosity = 0; static int verbosity = 0;
static int maxWarnings = 2002; static int maxWarnings = 2002;
@ -431,7 +430,6 @@ void QTestLog::stopLogging()
delete logger; delete logger;
} }
QTest::loggers.clear(); QTest::loggers.clear();
QTest::loggerUsingStdout = false;
saveCoverageTool(QTestResult::currentAppName(), failCount() != 0, QTestLog::installedTestCoverage()); saveCoverageTool(QTestResult::currentAppName(), failCount() != 0, QTestLog::installedTestCoverage());
} }
@ -439,8 +437,6 @@ void QTestLog::addLogger(LogMode mode, const char *filename)
{ {
if (filename && strcmp(filename, "-") == 0) if (filename && strcmp(filename, "-") == 0)
filename = nullptr; filename = nullptr;
if (!filename)
QTest::loggerUsingStdout = true;
QAbstractTestLogger *logger = nullptr; QAbstractTestLogger *logger = nullptr;
switch (mode) { switch (mode) {
@ -488,7 +484,12 @@ int QTestLog::loggerCount()
bool QTestLog::loggerUsingStdout() bool QTestLog::loggerUsingStdout()
{ {
return QTest::loggerUsingStdout; FOREACH_TEST_LOGGER {
if (logger->isLoggingToStdout())
return true;
}
return false;
} }
void QTestLog::warn(const char *msg, const char *file, int line) void QTestLog::warn(const char *msg, const char *file, int line)