diff options
author | Tobias Hunger <tobias.hunger@qt.io> | 2019-04-16 16:32:08 +0200 |
---|---|---|
committer | Tobias Hunger <tobias.hunger@qt.io> | 2019-04-16 16:32:08 +0200 |
commit | 6630937e63ae5797487b86743a7733c8ae5cc42c (patch) | |
tree | 3d53dacf6430f9099e1fb20835881205de674961 /tests/auto/testlib/selftests/expected_blacklisted.xunitxml | |
parent | 37ed6dae00640f9cc980ffda05347c12a7eb5d7e (diff) | |
parent | c7af193d2e49e9f10b86262e63d8d13abf72b5cf (diff) |
Merge commit 'dev' into 'wip/cmake-merge'
Change-Id: I176c40d031be26a1dd1cf08843e448a660598783
Diffstat (limited to 'tests/auto/testlib/selftests/expected_blacklisted.xunitxml')
-rw-r--r-- | tests/auto/testlib/selftests/expected_blacklisted.xunitxml | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/tests/auto/testlib/selftests/expected_blacklisted.xunitxml b/tests/auto/testlib/selftests/expected_blacklisted.xunitxml index 2752bc18b4..6e192687fb 100644 --- a/tests/auto/testlib/selftests/expected_blacklisted.xunitxml +++ b/tests/auto/testlib/selftests/expected_blacklisted.xunitxml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8" ?> -<testsuite errors="9" failures="3" tests="7" name="tst_Blacklisted"> +<testsuite errors="8" failures="3" tests="7" name="tst_Blacklisted"> <properties> <property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/> <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/> @@ -11,12 +11,8 @@ <!-- message="This test should SKIP" type="skip" --> </testcase> <testcase result="bfail" name="fail"/> - <testcase result="xfail" name="xfail"> - <!-- message="This test should XFAIL then BFAIL" type="info" --> - </testcase> - <testcase result="xpass" name="xpass"> - <failure message="'true' returned TRUE unexpectedly. (This test should XPASS, blacklist ignored for XPASS)" result="xpass"/> - </testcase> + <testcase result="bxfail" name="xfail"/> + <testcase result="bxpass" name="xpass"/> <testcase result="bfail" name="messages"> <!-- message="This is a warning that should not appear in silent test output" type="qwarn" --> <!-- message="This is an internal testlib warning that should not appear in silent test output" type="warn" --> @@ -28,7 +24,6 @@ </testcase> <system-err> <![CDATA[This test should SKIP]]> -<![CDATA[This test should XFAIL then BFAIL]]> <![CDATA[This is a warning that should not appear in silent test output]]> <![CDATA[This is an internal testlib warning that should not appear in silent test output]]> <![CDATA[This is a debug message that should not appear in silent test output]]> |