From f52cd2cbe2760cc32858628b7d9bba0ffc12e6ba Mon Sep 17 00:00:00 2001 From: Jason McDonald Date: Tue, 17 Jan 2012 16:12:02 +1000 Subject: Change testlib skipAll function to failure. Be more insistent that tests using the obsolete skipAll() function should change to using skip() by treating calls to skipAll() as test failures. After a further grace period the skipAll() function will be removed. Change-Id: Ic2448af2f8176909afa151b6e8c29587dfd17f1f Reviewed-by: Rohan McGovern --- src/imports/testlib/TestCase.qml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/imports/testlib/TestCase.qml b/src/imports/testlib/TestCase.qml index 0e49365c5f..182c52755d 100644 --- a/src/imports/testlib/TestCase.qml +++ b/src/imports/testlib/TestCase.qml @@ -313,10 +313,8 @@ Item { } function skipAll(msg) { - if (msg === undefined) - msg = "" - warn("The skipAll function is deprecated and will be removed soon. Please update this test by changing skipAll to skip.") - qtest_results.skip(msg, util.callerFile(), util.callerLine()) + msg = "The skipAll function is no longer available. Please update this test by changing skipAll to skip." + qtest_results.fail(msg, util.callerFile(), util.callerLine()) throw new Error("QtQuickTest::skip") } @@ -716,4 +714,4 @@ Item { if (when && !completed && !running) qtest_run() } -} \ No newline at end of file +} -- cgit v1.2.3