From 27f9f136f7e39b5d612bc02f7ff8778ab424c07d Mon Sep 17 00:00:00 2001 From: Jason McDonald Date: Wed, 19 Oct 2011 12:53:13 +1000 Subject: Remove SkipMode parameter from QSKIP calls. The previous commit removed SkipMode from the testlib APi. This commit removes the parameter from all calls to QSKIP. Task-number: QTBUG-21851, QTBUG-21652 Change-Id: I21c0ee6731c1bc6ac6d962590d9b31d7459dfbc5 Reviewed-by: Rohan McGovern --- .../exceptionsafety_objects/tst_exceptionsafety_objects.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'tests/auto/integrationtests/exceptionsafety_objects') diff --git a/tests/auto/integrationtests/exceptionsafety_objects/tst_exceptionsafety_objects.cpp b/tests/auto/integrationtests/exceptionsafety_objects/tst_exceptionsafety_objects.cpp index 0d410a79a2..21b359339d 100644 --- a/tests/auto/integrationtests/exceptionsafety_objects/tst_exceptionsafety_objects.cpp +++ b/tests/auto/integrationtests/exceptionsafety_objects/tst_exceptionsafety_objects.cpp @@ -87,7 +87,7 @@ private: #ifdef QT_NO_EXCEPTIONS void tst_ExceptionSafety_Objects::initTestCase() { - QSKIP("This test requires exception support", SkipAll); + QSKIP("This test requires exception support"); } #else @@ -353,7 +353,7 @@ void tst_ExceptionSafety_Objects::objects() || tag == QLatin1String("QSettings") || tag == QLatin1String("QThread") || tag == QLatin1String("QThreadPool")) - QSKIP("This type of object is not currently strongly exception safe", SkipSingle); + QSKIP("This type of object is not currently strongly exception safe"); QFETCH(AbstractTester *, objectCreator); @@ -488,7 +488,7 @@ void tst_ExceptionSafety_Objects::widgets() || tag == QLatin1String("QTreeView") || tag == QLatin1String("QTreeWidget") || tag == QLatin1String("QWorkspace")) - QSKIP("This type of widget is not currently strongly exception safe", SkipSingle); + QSKIP("This type of widget is not currently strongly exception safe"); QFETCH(AbstractTester *, widgetCreator); @@ -766,7 +766,7 @@ void tst_ExceptionSafety_Objects::vector() if (QLatin1String(QTest::currentDataTag()) == QLatin1String("insert static") || QLatin1String(QTest::currentDataTag()) == QLatin1String("insert moveable")) - QSKIP("QVector::insert is currently not strongly exception safe", SkipSingle); + QSKIP("QVector::insert is currently not strongly exception safe"); doOOMTest(testFunction, 0); } -- cgit v1.2.3