From 1c24b4b8d9fe16eaa4bc1598df117593d814bf50 Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Tue, 28 Sep 2021 17:16:45 +0200 Subject: Match up testlib selftest's lists of generated files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The actual files present for expected data, the test function that selected which tests to skip and the python function to select which to not generate data for weren't in sync with one another. The test-code's reason for omitting three tests was that we lacked data files for them. So generate those and skip that exception. The generator script's code to decide which to generate didn't exclude anything like as many, so update it to match the test-code. In the process, save repeating a startswith test that was used both positively and negatively, unifying two conditions. Extend the generator script's handling of its --skip-callgrind option by auto-setting that option if valgrind isn't available, to match the driver program's similar skipping. The generated data included many files for tests we skip and, as mentioned already, lacked files for some tests we only skipped because we lacked them. Remove the unused files, add the lacking ones. Change-Id: If91696cdd95b7b0d5f3d686bff839f1bf15e121b Reviewed-by: Tor Arne Vestbø --- tests/auto/testlib/selftests/expected_badxml.tap | 61 ------------------------ 1 file changed, 61 deletions(-) delete mode 100644 tests/auto/testlib/selftests/expected_badxml.tap (limited to 'tests/auto/testlib/selftests/expected_badxml.tap') diff --git a/tests/auto/testlib/selftests/expected_badxml.tap b/tests/auto/testlib/selftests/expected_badxml.tap deleted file mode 100644 index 81e4fe5312..0000000000 --- a/tests/auto/testlib/selftests/expected_badxml.tap +++ /dev/null @@ -1,61 +0,0 @@ -TAP version 13 -# tst_BadXml -ok 1 - initTestCase() -# a message -not ok 2 - badDataTag(fail end cdata ]]> text ]]> more text) - --- - # a failure - at: tst_BadXml::badDataTag() (qtbase/tests/auto/testlib/selftests/badxml/tst_badxml.cpp:0) - file: qtbase/tests/auto/testlib/selftests/badxml/tst_badxml.cpp - line: 0 - ... -# a message -ok 3 - badDataTag(pass end cdata ]]> text ]]> more text) -# a message -not ok 4 - badDataTag(fail quotes " text" more text) - --- - # a failure - at: tst_BadXml::badDataTag() (qtbase/tests/auto/testlib/selftests/badxml/tst_badxml.cpp:0) - file: qtbase/tests/auto/testlib/selftests/badxml/tst_badxml.cpp - line: 0 - ... -# a message -ok 5 - badDataTag(pass quotes " text" more text) -# a message -not ok 6 - badDataTag(fail xml close > open < tags < text) - --- - # a failure - at: tst_BadXml::badDataTag() (qtbase/tests/auto/testlib/selftests/badxml/tst_badxml.cpp:0) - file: qtbase/tests/auto/testlib/selftests/badxml/tst_badxml.cpp - line: 0 - ... -# a message -ok 7 - badDataTag(pass xml close > open < tags < text) -# a message -not ok 8 - badDataTag(fail all > " mixed ]]> up > " in < the ]]> hopes < of triggering "< ]]> bugs) - --- - # a failure - at: tst_BadXml::badDataTag() (qtbase/tests/auto/testlib/selftests/badxml/tst_badxml.cpp:0) - file: qtbase/tests/auto/testlib/selftests/badxml/tst_badxml.cpp - line: 0 - ... -# a message -ok 9 - badDataTag(pass all > " mixed ]]> up > " in < the ]]> hopes < of triggering "< ]]> bugs) -# end cdata ]]> text ]]> more text -ok 10 - badMessage(string 0) -# quotes " text" more text -ok 11 - badMessage(string 1) -# xml close > open < tags < text -ok 12 - badMessage(string 2) -# all > " mixed ]]> up > " in < the ]]> hopes < of triggering "< ]]> bugs -ok 13 - badMessage(string 3) -not ok 14 - failWithNoFile() - --- - # failure message - ... -ok 15 - encoding() # SKIP Skipped for text due to unpredictable console encoding. -ok 16 - cleanupTestCase() -1..16 -# tests 16 -# pass 10 -# fail 5 -- cgit v1.2.3