016cd01846
When the SkipAll mode is used, tests only report a SKIP for the first line of test data and subsequent lines are not reported at all. This behaviour makes it impossible for anything post-processing test results to accurately report test pass- and run- rates because they cannot see how many lines of test data were skipped. This commit removes SkipMode. QSKIPs in regular test functions and data functions are treated the same as SkipSingle, so that every skipped line of local or global test data is reported in the test log. QSKIPs elsewhere are treated the same as SkipAll -- skipping in init() causes the next test function to be skipped entirely, and skipping in initTestCase() or initTestCase_data() causes all test functions to be skipped. This commit only changes qtestlib and the selftests. A further commit will change the autotests to remove the SkipMode parameter from QSKIP calls. Note that the change in expected output for the globaldata selftest is deliberate, as the QSKIP in the skipLocal test function has effectively changed from SkipAll to SkipSingle. Task-number: QTBUG-21851, QTBUG-21652 Change-Id: I7b1c53fe7ca9dde032810b789d967e2a402bbe5d Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Alex <alex.blasche@nokia.com>
50 lines
3.2 KiB
Plaintext
50 lines
3.2 KiB
Plaintext
********* Start testing of tst_globaldata *********
|
|
Config: Using QTest library @INSERT_QT_VERSION_HERE@, Qt @INSERT_QT_VERSION_HERE@
|
|
QDEBUG : tst_globaldata::initTestCase() initTestCase initTestCase (null)
|
|
PASS : tst_globaldata::initTestCase()
|
|
QDEBUG : tst_globaldata::testGlobal(1:local 1) init testGlobal local 1
|
|
QDEBUG : tst_globaldata::testGlobal(1:local 1) global: false
|
|
QDEBUG : tst_globaldata::testGlobal(1:local 1) local: false
|
|
QDEBUG : tst_globaldata::testGlobal(1:local 1) cleanup testGlobal local 1
|
|
QDEBUG : tst_globaldata::testGlobal(1:local 2) init testGlobal local 2
|
|
QDEBUG : tst_globaldata::testGlobal(1:local 2) global: false
|
|
QDEBUG : tst_globaldata::testGlobal(1:local 2) local: true
|
|
QDEBUG : tst_globaldata::testGlobal(1:local 2) cleanup testGlobal local 2
|
|
QDEBUG : tst_globaldata::testGlobal(2:local 1) init testGlobal local 1
|
|
QDEBUG : tst_globaldata::testGlobal(2:local 1) global: true
|
|
QDEBUG : tst_globaldata::testGlobal(2:local 1) local: false
|
|
QDEBUG : tst_globaldata::testGlobal(2:local 1) cleanup testGlobal local 1
|
|
QDEBUG : tst_globaldata::testGlobal(2:local 2) init testGlobal local 2
|
|
QDEBUG : tst_globaldata::testGlobal(2:local 2) global: true
|
|
QDEBUG : tst_globaldata::testGlobal(2:local 2) local: true
|
|
QDEBUG : tst_globaldata::testGlobal(2:local 2) cleanup testGlobal local 2
|
|
PASS : tst_globaldata::testGlobal()
|
|
SKIP : tst_globaldata::skip(1) skipping
|
|
Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp(129)]
|
|
QDEBUG : tst_globaldata::skipLocal(1:local 1) init skipLocal local 1
|
|
SKIP : tst_globaldata::skipLocal(1:local 1) skipping
|
|
Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp(149)]
|
|
QDEBUG : tst_globaldata::skipLocal(1:local 1) cleanup skipLocal local 1
|
|
QDEBUG : tst_globaldata::skipLocal(1:local 2) init skipLocal local 2
|
|
SKIP : tst_globaldata::skipLocal(1:local 2) skipping
|
|
Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp(149)]
|
|
QDEBUG : tst_globaldata::skipLocal(1:local 2) cleanup skipLocal local 2
|
|
QDEBUG : tst_globaldata::skipSingle(1:local 1) init skipSingle local 1
|
|
QDEBUG : tst_globaldata::skipSingle(1:local 1) global: false local: false
|
|
QDEBUG : tst_globaldata::skipSingle(1:local 1) cleanup skipSingle local 1
|
|
QDEBUG : tst_globaldata::skipSingle(1:local 2) init skipSingle local 2
|
|
QDEBUG : tst_globaldata::skipSingle(1:local 2) global: false local: true
|
|
QDEBUG : tst_globaldata::skipSingle(1:local 2) cleanup skipSingle local 2
|
|
QDEBUG : tst_globaldata::skipSingle(2:local 1) init skipSingle local 1
|
|
SKIP : tst_globaldata::skipSingle(2:local 1) skipping
|
|
Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp(143)]
|
|
QDEBUG : tst_globaldata::skipSingle(2:local 1) cleanup skipSingle local 1
|
|
QDEBUG : tst_globaldata::skipSingle(2:local 2) init skipSingle local 2
|
|
QDEBUG : tst_globaldata::skipSingle(2:local 2) global: true local: true
|
|
QDEBUG : tst_globaldata::skipSingle(2:local 2) cleanup skipSingle local 2
|
|
PASS : tst_globaldata::skipSingle()
|
|
QDEBUG : tst_globaldata::cleanupTestCase() cleanupTestCase cleanupTestCase (null)
|
|
PASS : tst_globaldata::cleanupTestCase()
|
|
Totals: 4 passed, 0 failed, 4 skipped
|
|
********* Finished testing of tst_globaldata *********
|