AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ignore blackisted Pass and XFail when ignoring their plain forms

Browse Source 
It makes no sense to include output for a blacklisted test that would
have been excluded had it not been blacklisted.

Task-number: QTBUG-96844
Change-Id: I164e0c26a921101cbf8986904851260d181be00f
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
This commit is contained in:
Edward Welbourne 2021-09-27 16:04:02 +02:00
parent 77a93e6df3
commit 24b4f5b16c
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/testlib/qplaintestlogger.cpp
View File

@ -370,8 +370,8 @@ void QPlainTestLogger::leaveTestFunction()
void QPlainTestLogger::addIncident(IncidentTypes type, const char *description,
const char *file, int line)
{
// suppress PASS and XFAIL in silent mode
if ((type == QAbstractTestLogger::Pass || type == QAbstractTestLogger::XFail)
// suppress B?PASS and B?XFAIL in silent mode
if ((type == Pass || type == BlacklistedPass || type == XFail || type == BlacklistedXFail)
&& QTestLog::verboseLevel() < 0)
return;

4
src/testlib/qteamcitylogger.cpp
View File

@ -137,8 +137,8 @@ void QTeamCityLogger::leaveTestFunction()
void QTeamCityLogger::addIncident(IncidentTypes type, const char *description,
const char *file, int line)
{
// suppress PASS and XFAIL in silent mode
if ((type == QAbstractTestLogger::Pass || type == QAbstractTestLogger::XFail) && QTestLog::verboseLevel() < 0)
// suppress B?PASS and B?XFAIL in silent mode
if ((type == Pass || type == XFail || type == BlacklistedPass || type == BlacklistedXFail) && QTestLog::verboseLevel() < 0)
return;
QString buf;