path: root/src/testlib/qtest_global.h
diff options
authorJason McDonald <>2011-10-18 14:53:23 +1000
committerQt by Nokia <>2011-10-21 01:20:29 +0200
commit016cd01846539404a0eff1e3823fa2206fe2c9a9 (patch)
tree8971160e64893c8f674f209a49002aa59bfabdb0 /src/testlib/qtest_global.h
parent296bc328412f0cfec2318d04abd4717a4c70461c (diff)
Remove QTest::SkipMode from qtestlib API.
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 <> Reviewed-by: Alex <>
Diffstat (limited to 'src/testlib/qtest_global.h')
1 files changed, 0 insertions, 1 deletions
diff --git a/src/testlib/qtest_global.h b/src/testlib/qtest_global.h
index 974d82a0d5..6789c5938c 100644
--- a/src/testlib/qtest_global.h
+++ b/src/testlib/qtest_global.h
@@ -77,7 +77,6 @@ QT_MODULE(Test)
namespace QTest
- enum SkipMode { SkipSingle = 1, SkipAll = 2 };
enum TestFailMode { Abort = 1, Continue = 2 };
int Q_TESTLIB_EXPORT qt_snprintf(char *str, int size, const char *format, ...);