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>
58 lines
1.7 KiB
Plaintext
58 lines
1.7 KiB
Plaintext
TAP version 13
|
|
# tst_globaldata
|
|
# initTestCase initTestCase (null)
|
|
ok 1 - initTestCase()
|
|
# init testGlobal local=false
|
|
# global: false
|
|
# local: false
|
|
# cleanup testGlobal local=false
|
|
ok 2 - testGlobal(global=false:local=false)
|
|
# init testGlobal local=true
|
|
# global: false
|
|
# local: true
|
|
# cleanup testGlobal local=true
|
|
ok 3 - testGlobal(global=false:local=true)
|
|
# init testGlobal local=false
|
|
# global: true
|
|
# local: false
|
|
# cleanup testGlobal local=false
|
|
ok 4 - testGlobal(global=true:local=false)
|
|
# init testGlobal local=true
|
|
# global: true
|
|
# local: true
|
|
# cleanup testGlobal local=true
|
|
ok 5 - testGlobal(global=true:local=true)
|
|
ok 6 - skip(global=false) # SKIP skipping
|
|
# init skipLocal local=false
|
|
ok 7 - skipLocal(global=false:local=false) # SKIP skipping
|
|
# cleanup skipLocal local=false
|
|
# init skipLocal local=true
|
|
ok 8 - skipLocal(global=false:local=true) # SKIP skipping
|
|
# cleanup skipLocal local=true
|
|
# init skipLocal local=false
|
|
ok 9 - skipLocal(global=true:local=false) # SKIP skipping
|
|
# cleanup skipLocal local=false
|
|
# init skipLocal local=true
|
|
ok 10 - skipLocal(global=true:local=true) # SKIP skipping
|
|
# cleanup skipLocal local=true
|
|
# init skipSingle local=false
|
|
# global: false local: false
|
|
# cleanup skipSingle local=false
|
|
ok 11 - skipSingle(global=false:local=false)
|
|
# init skipSingle local=true
|
|
ok 12 - skipSingle(global=false:local=true) # SKIP Skipping
|
|
# cleanup skipSingle local=true
|
|
# init skipSingle local=false
|
|
ok 13 - skipSingle(global=true:local=false) # SKIP Skipping
|
|
# cleanup skipSingle local=false
|
|
# init skipSingle local=true
|
|
# global: true local: true
|
|
# cleanup skipSingle local=true
|
|
ok 14 - skipSingle(global=true:local=true)
|
|
# cleanupTestCase cleanupTestCase (null)
|
|
ok 15 - cleanupTestCase()
|
|
1..15
|
|
# tests 15
|
|
# pass 8
|
|
# fail 0
|