diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2021-09-27 16:04:02 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2021-12-09 20:54:26 +0100 |
| commit | 24b4f5b16cd27371152154dc667387d6f54713ff (patch) | |
| tree | deada5f14e932546d09b1a54c69f4e620ed10bc5 /src | |
| parent | 77a93e6df331e5ed22aef4335d8de38abe2ca586 (diff) | |
Ignore blackisted Pass and XFail when ignoring their plain forms
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>
Diffstat (limited to 'src')
| -rw-r--r-- | src/testlib/qplaintestlogger.cpp | 4 | ||||
| -rw-r--r-- | src/testlib/qteamcitylogger.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/testlib/qplaintestlogger.cpp b/src/testlib/qplaintestlogger.cpp index 75517ac060..8ebea12825 100644 --- a/src/testlib/qplaintestlogger.cpp +++ b/src/testlib/qplaintestlogger.cpp @@ -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; diff --git a/src/testlib/qteamcitylogger.cpp b/src/testlib/qteamcitylogger.cpp index 10d91be178..a296122b6f 100644 --- a/src/testlib/qteamcitylogger.cpp +++ b/src/testlib/qteamcitylogger.cpp @@ -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; |