b82b3f4067
TestMethods::invokeTest() has an outer loop on global data (albeit with a comment that said otherwise). On its first cycle, we run the test function's *_data() method, if it has one; there is an inner loop on the rows this created. If the *_data() QSKIP()s, we need to skip the whole test; otherwise, a QSKIP() in one sub-test should not lead to skipping the remaining sub-tests. Moved the check for *_data() QSKIP()ping to right after *_data() returns, inside the "first global cycle" block that runs it. Previously, this check was done before entering the loop on local data rows, but outside that "first global cycle" block: consequently, later global cycles would fall foul of this check (even though the *_data() hasn't been run in this cycle, much less QSKIP()ped in it) if the last sub-test of the previous global cycle had QSKIP()ped. When running a single test for one specific data row, if the test's *_data() QSKIP()ped, this misplaced check would also have lead to a misleading "Unknown testdata" warning. Changed testlib/selftests' tst_globaldata::skipSingle() to trigger the bug (by having its last local row of first global row skip, which caused the second global row to be omitted) to verify this is also fixed; and amended one of its comments to reflect what's now to be expected. Updated the test's expected output files. Task-number: QTBUG-61774 Change-Id: I99596b595c6d1184038f23383844c6ff51a0cd91 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
109 lines
5.8 KiB
XML
109 lines
5.8 KiB
XML
<?xml version="1.0" encoding="UTF-8" ?>
|
|
<testsuite errors="43" failures="0" tests="6" name="tst_globaldata">
|
|
<properties>
|
|
<property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/>
|
|
<property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/>
|
|
<property value="" name="QtBuild"/>
|
|
</properties>
|
|
<testcase result="pass" name="initTestCase">
|
|
<!-- message="initTestCase initTestCase (null)" type="qdebug" -->
|
|
</testcase>
|
|
<testcase result="pass" name="testGlobal">
|
|
<!-- tag="global=false:local=false" message="init testGlobal local=false" type="qdebug" -->
|
|
<!-- tag="global=false:local=false" message="global: false" type="qdebug" -->
|
|
<!-- tag="global=false:local=false" message="local: false" type="qdebug" -->
|
|
<!-- tag="global=false:local=false" message="cleanup testGlobal local=false" type="qdebug" -->
|
|
<!-- tag="global=false:local=true" message="init testGlobal local=true" type="qdebug" -->
|
|
<!-- tag="global=false:local=true" message="global: false" type="qdebug" -->
|
|
<!-- tag="global=false:local=true" message="local: true" type="qdebug" -->
|
|
<!-- tag="global=false:local=true" message="cleanup testGlobal local=true" type="qdebug" -->
|
|
<!-- tag="global=true:local=false" message="init testGlobal local=false" type="qdebug" -->
|
|
<!-- tag="global=true:local=false" message="global: true" type="qdebug" -->
|
|
<!-- tag="global=true:local=false" message="local: false" type="qdebug" -->
|
|
<!-- tag="global=true:local=false" message="cleanup testGlobal local=false" type="qdebug" -->
|
|
<!-- tag="global=true:local=true" message="init testGlobal local=true" type="qdebug" -->
|
|
<!-- tag="global=true:local=true" message="global: true" type="qdebug" -->
|
|
<!-- tag="global=true:local=true" message="local: true" type="qdebug" -->
|
|
<!-- tag="global=true:local=true" message="cleanup testGlobal local=true" type="qdebug" -->
|
|
</testcase>
|
|
<testcase name="skip">
|
|
<!-- tag="global=false" message="skipping" type="skip" -->
|
|
</testcase>
|
|
<testcase name="skipLocal">
|
|
<!-- tag="global=false:local=false" message="init skipLocal local=false" type="qdebug" -->
|
|
<!-- tag="global=false:local=false" message="skipping" type="skip" -->
|
|
<!-- tag="global=false:local=false" message="cleanup skipLocal local=false" type="qdebug" -->
|
|
<!-- tag="global=false:local=true" message="init skipLocal local=true" type="qdebug" -->
|
|
<!-- tag="global=false:local=true" message="skipping" type="skip" -->
|
|
<!-- tag="global=false:local=true" message="cleanup skipLocal local=true" type="qdebug" -->
|
|
<!-- tag="global=true:local=false" message="init skipLocal local=false" type="qdebug" -->
|
|
<!-- tag="global=true:local=false" message="skipping" type="skip" -->
|
|
<!-- tag="global=true:local=false" message="cleanup skipLocal local=false" type="qdebug" -->
|
|
<!-- tag="global=true:local=true" message="init skipLocal local=true" type="qdebug" -->
|
|
<!-- tag="global=true:local=true" message="skipping" type="skip" -->
|
|
<!-- tag="global=true:local=true" message="cleanup skipLocal local=true" type="qdebug" -->
|
|
</testcase>
|
|
<testcase result="pass" name="skipSingle">
|
|
<!-- tag="global=false:local=false" message="init skipSingle local=false" type="qdebug" -->
|
|
<!-- tag="global=false:local=false" message="global: false local: false" type="qdebug" -->
|
|
<!-- tag="global=false:local=false" message="cleanup skipSingle local=false" type="qdebug" -->
|
|
<!-- tag="global=false:local=true" message="init skipSingle local=true" type="qdebug" -->
|
|
<!-- tag="global=false:local=true" message="Skipping" type="skip" -->
|
|
<!-- tag="global=false:local=true" message="cleanup skipSingle local=true" type="qdebug" -->
|
|
<!-- tag="global=true:local=false" message="init skipSingle local=false" type="qdebug" -->
|
|
<!-- tag="global=true:local=false" message="Skipping" type="skip" -->
|
|
<!-- tag="global=true:local=false" message="cleanup skipSingle local=false" type="qdebug" -->
|
|
<!-- tag="global=true:local=true" message="init skipSingle local=true" type="qdebug" -->
|
|
<!-- tag="global=true:local=true" message="global: true local: true" type="qdebug" -->
|
|
<!-- tag="global=true:local=true" message="cleanup skipSingle local=true" type="qdebug" -->
|
|
</testcase>
|
|
<testcase result="pass" name="cleanupTestCase">
|
|
<!-- message="cleanupTestCase cleanupTestCase (null)" type="qdebug" -->
|
|
</testcase>
|
|
<system-err>
|
|
<![CDATA[initTestCase initTestCase (null)]]>
|
|
<![CDATA[init testGlobal local=false]]>
|
|
<![CDATA[global: false]]>
|
|
<![CDATA[local: false]]>
|
|
<![CDATA[cleanup testGlobal local=false]]>
|
|
<![CDATA[init testGlobal local=true]]>
|
|
<![CDATA[global: false]]>
|
|
<![CDATA[local: true]]>
|
|
<![CDATA[cleanup testGlobal local=true]]>
|
|
<![CDATA[init testGlobal local=false]]>
|
|
<![CDATA[global: true]]>
|
|
<![CDATA[local: false]]>
|
|
<![CDATA[cleanup testGlobal local=false]]>
|
|
<![CDATA[init testGlobal local=true]]>
|
|
<![CDATA[global: true]]>
|
|
<![CDATA[local: true]]>
|
|
<![CDATA[cleanup testGlobal local=true]]>
|
|
<![CDATA[skipping]]>
|
|
<![CDATA[init skipLocal local=false]]>
|
|
<![CDATA[skipping]]>
|
|
<![CDATA[cleanup skipLocal local=false]]>
|
|
<![CDATA[init skipLocal local=true]]>
|
|
<![CDATA[skipping]]>
|
|
<![CDATA[cleanup skipLocal local=true]]>
|
|
<![CDATA[init skipLocal local=false]]>
|
|
<![CDATA[skipping]]>
|
|
<![CDATA[cleanup skipLocal local=false]]>
|
|
<![CDATA[init skipLocal local=true]]>
|
|
<![CDATA[skipping]]>
|
|
<![CDATA[cleanup skipLocal local=true]]>
|
|
<![CDATA[init skipSingle local=false]]>
|
|
<![CDATA[global: false local: false]]>
|
|
<![CDATA[cleanup skipSingle local=false]]>
|
|
<![CDATA[init skipSingle local=true]]>
|
|
<![CDATA[Skipping]]>
|
|
<![CDATA[cleanup skipSingle local=true]]>
|
|
<![CDATA[init skipSingle local=false]]>
|
|
<![CDATA[Skipping]]>
|
|
<![CDATA[cleanup skipSingle local=false]]>
|
|
<![CDATA[init skipSingle local=true]]>
|
|
<![CDATA[global: true local: true]]>
|
|
<![CDATA[cleanup skipSingle local=true]]>
|
|
<![CDATA[cleanupTestCase cleanupTestCase (null)]]>
|
|
</system-err>
|
|
</testsuite>
|