diff options
author | Edward Welbourne <edward.welbourne@qt.io> | 2021-09-23 15:59:32 +0200 |
---|---|---|
committer | Edward Welbourne <edward.welbourne@qt.io> | 2021-12-09 20:54:26 +0100 |
commit | 77a93e6df331e5ed22aef4335d8de38abe2ca586 (patch) | |
tree | ace152ec3685282a07f890e4c95aac057693b5e5 /tests/auto/testlib/selftests/expected_blacklisted.xml | |
parent | 1c24b4b8d9fe16eaa4bc1598df117593d814bf50 (diff) |
Make Skip an incident in test logging
Skip ends the test (albeit inconclusively). Rearrange the enums in
the abstract logger, move code to handle skip between relevant
function and tidy up various things that became simpler as a result.
Also reorder the message enum, and its switches, to separate testlib's
internals from the usual Qt messages, and put each group in ascending
order of severity.
Task-number: QTBUG-96844
Change-Id: I2c7a634b9f849830d64eafa750155e66e244b729
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'tests/auto/testlib/selftests/expected_blacklisted.xml')
-rw-r--r-- | tests/auto/testlib/selftests/expected_blacklisted.xml | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/auto/testlib/selftests/expected_blacklisted.xml b/tests/auto/testlib/selftests/expected_blacklisted.xml index 959a87de68..b57d589544 100644 --- a/tests/auto/testlib/selftests/expected_blacklisted.xml +++ b/tests/auto/testlib/selftests/expected_blacklisted.xml @@ -17,9 +17,9 @@ <Duration msecs="0"/> </TestFunction> <TestFunction name="skip"> -<Message type="skip" file="qtbase/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp" line="0"> +<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp" line="0"> <Description><![CDATA[This test should SKIP]]></Description> -</Message> +</Incident> <Duration msecs="0"/> </TestFunction> <TestFunction name="fail"> @@ -39,9 +39,9 @@ <Incident type="bxfail" file="qtbase/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp" line="0"> <Description><![CDATA[This test should BXFAIL then SKIP]]></Description> </Incident> -<Message type="skip" file="qtbase/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp" line="0"> +<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp" line="0"> <Description><![CDATA[This skip should be seen and counted]]></Description> -</Message> +</Incident> <Duration msecs="0"/> </TestFunction> <TestFunction name="xfailContinueFail"> @@ -63,9 +63,9 @@ <Incident type="bxpass" file="qtbase/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp" line="0"> <Description><![CDATA['true' returned TRUE unexpectedly. (This test should BXPASS then SKIP)]]></Description> </Incident> -<Message type="skip" file="qtbase/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp" line="0"> +<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp" line="0"> <Description><![CDATA[This skip should be seen but not counted]]></Description> -</Message> +</Incident> <Duration msecs="0"/> </TestFunction> <TestFunction name="xpassContinueFail"> |