AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5e67e7efaa
qt5base-lts/tests/auto/testlib/selftests/expected_globaldata.txt
Edward Welbourne b82b3f4067 Fix the skip-check in TestMethods::invokeTest() 
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>
2019-03-29 14:00:03 +00:00

63 lines
4.6 KiB
Plaintext
Raw Blame History

********* Start testing of tst_globaldata *********
Config: Using QtTest library
QDEBUG : tst_globaldata::initTestCase() initTestCase initTestCase (null)
PASS : tst_globaldata::initTestCase()
QDEBUG : tst_globaldata::testGlobal(global=false:local=false) init testGlobal local=false
QDEBUG : tst_globaldata::testGlobal(global=false:local=false) global: false
QDEBUG : tst_globaldata::testGlobal(global=false:local=false) local: false
QDEBUG : tst_globaldata::testGlobal(global=false:local=false) cleanup testGlobal local=false
PASS : tst_globaldata::testGlobal(global=false:local=false)
QDEBUG : tst_globaldata::testGlobal(global=false:local=true) init testGlobal local=true
QDEBUG : tst_globaldata::testGlobal(global=false:local=true) global: false
QDEBUG : tst_globaldata::testGlobal(global=false:local=true) local: true
QDEBUG : tst_globaldata::testGlobal(global=false:local=true) cleanup testGlobal local=true
PASS : tst_globaldata::testGlobal(global=false:local=true)
QDEBUG : tst_globaldata::testGlobal(global=true:local=false) init testGlobal local=false
QDEBUG : tst_globaldata::testGlobal(global=true:local=false) global: true
QDEBUG : tst_globaldata::testGlobal(global=true:local=false) local: false
QDEBUG : tst_globaldata::testGlobal(global=true:local=false) cleanup testGlobal local=false
PASS : tst_globaldata::testGlobal(global=true:local=false)
QDEBUG : tst_globaldata::testGlobal(global=true:local=true) init testGlobal local=true
QDEBUG : tst_globaldata::testGlobal(global=true:local=true) global: true
QDEBUG : tst_globaldata::testGlobal(global=true:local=true) local: true
QDEBUG : tst_globaldata::testGlobal(global=true:local=true) cleanup testGlobal local=true
PASS : tst_globaldata::testGlobal(global=true:local=true)
SKIP : tst_globaldata::skip(global=false) skipping
Loc: [qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp(0)]
QDEBUG : tst_globaldata::skipLocal(global=false:local=false) init skipLocal local=false
SKIP : tst_globaldata::skipLocal(global=false:local=false) skipping
Loc: [qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp(0)]
QDEBUG : tst_globaldata::skipLocal(global=false:local=false) cleanup skipLocal local=false
QDEBUG : tst_globaldata::skipLocal(global=false:local=true) init skipLocal local=true
SKIP : tst_globaldata::skipLocal(global=false:local=true) skipping
Loc: [qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp(0)]
QDEBUG : tst_globaldata::skipLocal(global=false:local=true) cleanup skipLocal local=true
QDEBUG : tst_globaldata::skipLocal(global=true:local=false) init skipLocal local=false
SKIP : tst_globaldata::skipLocal(global=true:local=false) skipping
Loc: [qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp(0)]
QDEBUG : tst_globaldata::skipLocal(global=true:local=false) cleanup skipLocal local=false
QDEBUG : tst_globaldata::skipLocal(global=true:local=true) init skipLocal local=true
SKIP : tst_globaldata::skipLocal(global=true:local=true) skipping
Loc: [qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp(0)]
QDEBUG : tst_globaldata::skipLocal(global=true:local=true) cleanup skipLocal local=true
QDEBUG : tst_globaldata::skipSingle(global=false:local=false) init skipSingle local=false
QDEBUG : tst_globaldata::skipSingle(global=false:local=false) global: false local: false
QDEBUG : tst_globaldata::skipSingle(global=false:local=false) cleanup skipSingle local=false
PASS : tst_globaldata::skipSingle(global=false:local=false)
QDEBUG : tst_globaldata::skipSingle(global=false:local=true) init skipSingle local=true
SKIP : tst_globaldata::skipSingle(global=false:local=true) Skipping
Loc: [qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp(0)]
QDEBUG : tst_globaldata::skipSingle(global=false:local=true) cleanup skipSingle local=true
QDEBUG : tst_globaldata::skipSingle(global=true:local=false) init skipSingle local=false
SKIP : tst_globaldata::skipSingle(global=true:local=false) Skipping
Loc: [qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp(0)]
QDEBUG : tst_globaldata::skipSingle(global=true:local=false) cleanup skipSingle local=false
QDEBUG : tst_globaldata::skipSingle(global=true:local=true) init skipSingle local=true
QDEBUG : tst_globaldata::skipSingle(global=true:local=true) global: true local: true
QDEBUG : tst_globaldata::skipSingle(global=true:local=true) cleanup skipSingle local=true
PASS : tst_globaldata::skipSingle(global=true:local=true)
QDEBUG : tst_globaldata::cleanupTestCase() cleanupTestCase cleanupTestCase (null)
PASS : tst_globaldata::cleanupTestCase()
Totals: 8 passed, 0 failed, 7 skipped, 0 blacklisted, 0ms
********* Finished testing of tst_globaldata *********
Reference in New Issue View Git Blame Copy Permalink