summaryrefslogtreecommitdiffstats
path: root/src/testlib/qxmltestlogger.cpp
diff options
context:
space:
mode:
authorOliver Wolff <oliver.wolff@qt.io>2019-01-15 09:58:34 +0100
committerTony Sarajärvi <tony.sarajarvi@qt.io>2019-01-29 12:18:15 +0000
commit9906cc57ed3eed64d534f43c677bb16e08561bb6 (patch)
tree93203141f6d7731455e3f89f88f0387893b12be1 /src/testlib/qxmltestlogger.cpp
parent3615e8aaa158cc88edf539a2252f96a8c635b4cd (diff)
testlib: Add BXPASS and BXFAIL
Prioritize blacklisting over QEXPECT_FAIL so that a test that is blacklisted no longer fails if QEXPECT_FAIL returns true unexpectedly. To reflect this state properly, the two values of BXPASS and BXFAIL were added to testlib's output. [ChangeLog][Important Behavior Changes][QtTestLib] Blacklisting of tests will be taken into account for XPASS and XFAIL. A blacklisted test that causes an XPASS will no longer be a fail. Task-number: QTBUG-72928 Change-Id: Ia2232fdc714d405fa3fd9aea6c89eb2836bc5950 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'src/testlib/qxmltestlogger.cpp')
-rw-r--r--src/testlib/qxmltestlogger.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/testlib/qxmltestlogger.cpp b/src/testlib/qxmltestlogger.cpp
index 7153c016c5..c47042c3a0 100644
--- a/src/testlib/qxmltestlogger.cpp
+++ b/src/testlib/qxmltestlogger.cpp
@@ -91,6 +91,10 @@ namespace QTest {
return "bpass";
case QAbstractTestLogger::BlacklistedFail:
return "bfail";
+ case QAbstractTestLogger::BlacklistedXPass:
+ return "bxpass";
+ case QAbstractTestLogger::BlacklistedXFail:
+ return "bxfail";
}
return "??????";
}