diff options
author | Edward Welbourne <edward.welbourne@qt.io> | 2016-07-29 13:18:24 +0200 |
---|---|---|
committer | Edward Welbourne <edward.welbourne@qt.io> | 2017-10-11 09:59:44 +0000 |
commit | 98ef376fb6053ab4171fa9b7c98916f0dbb1b798 (patch) | |
tree | 91306c0a9e3d28ae5da3720bcfa76ba003a49638 /tests/auto/testlib/selftests/expected_expectfail.lightxml | |
parent | aebc9023bb0acb9697540b444a6dfae95b762644 (diff) |
generate_expected_output.py: update generated expected_* files
In selftests.qrc, imposed alphabetic order (on stem of name, then on
suffix, effectively treating . as sorting before any letter) while
removing old tests and adding new tests and data. Updated all non-csv
files and added many missing files. (Not clear on csv support status;
the script seems to have dropped it after 5.6, but the test still uses
it.)
Left expected_crashes* alone (no new files added, no update to old) as
I don't get results resembling those anticipated.
Omitted printdatatagswithglobaltags, printdatatags due to dangling
hspace on output lines, which upset sanity-bot. A change to the test
cpp is needed to make it viable to skip that dangling hspace.
Change-Id: Iab3fb626c44a91c249b2fb626c12c75ea0317098
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
Diffstat (limited to 'tests/auto/testlib/selftests/expected_expectfail.lightxml')
-rw-r--r-- | tests/auto/testlib/selftests/expected_expectfail.lightxml | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/tests/auto/testlib/selftests/expected_expectfail.lightxml b/tests/auto/testlib/selftests/expected_expectfail.lightxml index cd5ab78fbe..7c91656b89 100644 --- a/tests/auto/testlib/selftests/expected_expectfail.lightxml +++ b/tests/auto/testlib/selftests/expected_expectfail.lightxml @@ -5,46 +5,46 @@ </Environment> <TestFunction name="initTestCase"> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="xfailAndContinue"> <Message type="qdebug" file="" line="0"> <Description><![CDATA[begin]]></Description> </Message> -<Incident type="xfail" file="tst_expectfail.cpp" line="78"> +<Incident type="xfail" file="qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="0"> <Description><![CDATA[This should xfail]]></Description> </Incident> <Message type="qdebug" file="" line="0"> <Description><![CDATA[after]]></Description> </Message> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="xfailAndAbort"> <Message type="qdebug" file="" line="0"> <Description><![CDATA[begin]]></Description> </Message> -<Incident type="xfail" file="tst_expectfail.cpp" line="86"> +<Incident type="xfail" file="qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="0"> <Description><![CDATA[This should xfail]]></Description> </Incident> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="xfailTwice"> -<Incident type="fail" file="tst_expectfail.cpp" line="96"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="0"> <Description><![CDATA[Already expecting a fail]]></Description> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="xfailWithQString"> -<Incident type="xfail" file="tst_expectfail.cpp" line="105"> +<Incident type="xfail" file="qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="0"> <Description><![CDATA[A string]]></Description> </Incident> -<Incident type="xfail" file="tst_expectfail.cpp" line="110"> +<Incident type="xfail" file="qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="0"> <Description><![CDATA[Bug 5 (The message)]]></Description> </Incident> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="xfailDataDrivenWithQVerify"> <Incident type="pass" file="" line="0"> @@ -53,21 +53,21 @@ <Incident type="pass" file="" line="0"> <DataTag><![CDATA[Pass 2]]></DataTag> </Incident> -<Incident type="xfail" file="tst_expectfail.cpp" line="139"> +<Incident type="xfail" file="qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="0"> <DataTag><![CDATA[Abort]]></DataTag> <Description><![CDATA[This test should xfail]]></Description> </Incident> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[Abort]]></DataTag> </Incident> -<Incident type="xfail" file="tst_expectfail.cpp" line="139"> +<Incident type="xfail" file="qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="0"> <DataTag><![CDATA[Continue]]></DataTag> <Description><![CDATA[This test should xfail]]></Description> </Incident> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[Continue]]></DataTag> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="xfailDataDrivenWithQCompare"> <Incident type="pass" file="" line="0"> @@ -76,44 +76,44 @@ <Incident type="pass" file="" line="0"> <DataTag><![CDATA[Pass 2]]></DataTag> </Incident> -<Incident type="xfail" file="tst_expectfail.cpp" line="173"> +<Incident type="xfail" file="qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="0"> <DataTag><![CDATA[Abort]]></DataTag> <Description><![CDATA[This test should xfail]]></Description> </Incident> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[Abort]]></DataTag> </Incident> -<Incident type="xfail" file="tst_expectfail.cpp" line="173"> +<Incident type="xfail" file="qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="0"> <DataTag><![CDATA[Continue]]></DataTag> <Description><![CDATA[This test should xfail]]></Description> </Incident> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[Continue]]></DataTag> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="xfailOnWrongRow"> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[right row]]></DataTag> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="xfailOnAnyRow"> -<Incident type="xfail" file="tst_expectfail.cpp" line="208"> +<Incident type="xfail" file="qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="0"> <DataTag><![CDATA[first row]]></DataTag> <Description><![CDATA[This test should xfail]]></Description> </Incident> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[first row]]></DataTag> </Incident> -<Incident type="xfail" file="tst_expectfail.cpp" line="208"> +<Incident type="xfail" file="qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="0"> <DataTag><![CDATA[second row]]></DataTag> <Description><![CDATA[This test should xfail]]></Description> </Incident> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[second row]]></DataTag> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="xfailWithoutVerify"> <Incident type="fail" file="" line="0"> @@ -124,36 +124,36 @@ <DataTag><![CDATA[second row]]></DataTag> <Description><![CDATA[QEXPECT_FAIL was called without any subsequent verification statements]]></Description> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="xpass"> -<Incident type="xpass" file="tst_expectfail.cpp" line="228"> +<Incident type="xpass" file="qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="0"> <Description><![CDATA['true' returned TRUE unexpectedly. ()]]></Description> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="xpassDataDrivenWithQVerify"> -<Incident type="xpass" file="tst_expectfail.cpp" line="250"> +<Incident type="xpass" file="qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="0"> <DataTag><![CDATA[XPass]]></DataTag> <Description><![CDATA['true' returned TRUE unexpectedly. ()]]></Description> </Incident> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[Pass]]></DataTag> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="xpassDataDrivenWithQCompare"> -<Incident type="xpass" file="tst_expectfail.cpp" line="271"> +<Incident type="xpass" file="qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="0"> <DataTag><![CDATA[XPass]]></DataTag> <Description><![CDATA[QCOMPARE(1, 1) returned TRUE unexpectedly.]]></Description> </Incident> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[Pass]]></DataTag> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="cleanupTestCase"> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <Duration msecs="0"/> |