diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-20 01:01:00 +0100 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2019-02-20 09:51:12 +0100 |
| commit | 035f934d7a798e97bf0213a5d42a3d511132f03d (patch) | |
| tree | 89aa6efdc86864ce479cddca6b9c4ba523c2754a /tests/auto/testlib/selftests/expected_blacklisted.xunitxml | |
| parent | f4cc23cffbe3005f0a522cac938695e87ecd6407 (diff) | |
| parent | da4ab444ffac37514435364d4d3f0ad59d4f9bc3 (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp
Added tests/auto/testlib/selftests/expected_crashes_5.txt to work
round the output of the crashes test (which exercises UB, see
QTBUG-73903) being truncated on one test platform.
Change-Id: I9cd3f2639b4e50c3c4513e14629a40bdca8f8273
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 e2d0cd009b..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 BPASS" 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 BPASS]]> <![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]]> |