From eff98a7784a314062a8137b96ce93b155b5a22b8 Mon Sep 17 00:00:00 2001 From: Rohan McGovern Date: Tue, 22 May 2012 08:45:27 +1000 Subject: [PATCH] Removed CONFIG+=parallel_test from suspected parallel-unsafe tests These tests have failed a parallel stress test and may contribute to instability in test runs. Change-Id: I8d82e9df7df6cac374b8b2eda43de8e96b676972 Reviewed-by: Michael Brasser --- tests/auto/qml/debugger/qdebugmessageservice/qdebugmessageservice.pro | 2 -- tests/auto/qml/debugger/qqmldebugservice/qqmldebugservice.pro | 2 -- .../auto/qml/debugger/qqmlenginedebugservice/qqmlenginedebugservice.pro | 2 -- tests/auto/qml/debugger/qqmlinspector/qqmlinspector.pro | 2 -- tests/auto/qml/debugger/qqmlprofilerservice/qqmlprofilerservice.pro | 2 -- tests/auto/qml/debugger/qv8profilerservice/qv8profilerservice.pro | 2 -- tests/auto/qml/qqmlcomponent/qqmlcomponent.pro | 2 -- tests/auto/qml/qqmlecmascript/qqmlecmascript.pro | 1 - tests/auto/qml/qqmlengine/qqmlengine.pro | 2 -- tests/auto/qml/qqmllanguage/qqmllanguage.pro | 1 - tests/auto/qml/qqmlsqldatabase/qqmlsqldatabase.pro | 2 -- tests/auto/qml/qqmlxmlhttprequest/qqmlxmlhttprequest.pro | 2 -- .../qml/qquicklistmodelworkerscript/qquicklistmodelworkerscript.pro | 2 -- tests/auto/quick/qquickanimatedimage/qquickanimatedimage.pro | 2 -- tests/auto/quick/qquickborderimage/qquickborderimage.pro | 2 -- tests/auto/quick/qquickfontloader/qquickfontloader.pro | 2 -- tests/auto/quick/qquickimage/qquickimage.pro | 1 - tests/auto/quick/qquickitem/qquickitem.pro | 1 - tests/auto/quick/qquickpathview/qquickpathview.pro | 1 - tests/auto/quick/qquickpixmapcache/qquickpixmapcache.pro | 1 - tests/auto/quick/qquicktext/qquicktext.pro | 2 -- 21 files changed, 36 deletions(-) diff --git a/tests/auto/qml/debugger/qdebugmessageservice/qdebugmessageservice.pro b/tests/auto/qml/debugger/qdebugmessageservice/qdebugmessageservice.pro index 64f7274..d8963dd 100644 --- a/tests/auto/qml/debugger/qdebugmessageservice/qdebugmessageservice.pro +++ b/tests/auto/qml/debugger/qdebugmessageservice/qdebugmessageservice.pro @@ -11,6 +11,4 @@ include(../shared/debugutil.pri) TESTDATA = data/* -CONFIG += parallel_test - OTHER_FILES += data/test.qml diff --git a/tests/auto/qml/debugger/qqmldebugservice/qqmldebugservice.pro b/tests/auto/qml/debugger/qqmldebugservice/qqmldebugservice.pro index 39d9903..f175c9f 100644 --- a/tests/auto/qml/debugger/qqmldebugservice/qqmldebugservice.pro +++ b/tests/auto/qml/debugger/qqmldebugservice/qqmldebugservice.pro @@ -11,8 +11,6 @@ INCLUDEPATH += ../shared include(../../../shared/util.pri) include(../shared/debugutil.pri) -CONFIG += parallel_test - DEFINES += QT_QML_DEBUG_NO_WARNING QT += qml-private testlib diff --git a/tests/auto/qml/debugger/qqmlenginedebugservice/qqmlenginedebugservice.pro b/tests/auto/qml/debugger/qqmlenginedebugservice/qqmlenginedebugservice.pro index c48ddcc..983fdb3 100644 --- a/tests/auto/qml/debugger/qqmlenginedebugservice/qqmlenginedebugservice.pro +++ b/tests/auto/qml/debugger/qqmlenginedebugservice/qqmlenginedebugservice.pro @@ -13,8 +13,6 @@ INCLUDEPATH += ../shared include(../../../shared/util.pri) include(../shared/debugutil.pri) -CONFIG += parallel_test - DEFINES += QT_QML_DEBUG_NO_WARNING QT += core-private qml-private quick-private v8-private testlib diff --git a/tests/auto/qml/debugger/qqmlinspector/qqmlinspector.pro b/tests/auto/qml/debugger/qqmlinspector/qqmlinspector.pro index 0ad6b6c..1d42dde 100644 --- a/tests/auto/qml/debugger/qqmlinspector/qqmlinspector.pro +++ b/tests/auto/qml/debugger/qqmlinspector/qqmlinspector.pro @@ -11,5 +11,3 @@ include(../../../shared/util.pri) include(../shared/debugutil.pri) TESTDATA = data/* - -CONFIG += parallel_test diff --git a/tests/auto/qml/debugger/qqmlprofilerservice/qqmlprofilerservice.pro b/tests/auto/qml/debugger/qqmlprofilerservice/qqmlprofilerservice.pro index 5181414..c913896 100644 --- a/tests/auto/qml/debugger/qqmlprofilerservice/qqmlprofilerservice.pro +++ b/tests/auto/qml/debugger/qqmlprofilerservice/qqmlprofilerservice.pro @@ -10,6 +10,4 @@ include(../shared/debugutil.pri) TESTDATA = data/* -CONFIG += parallel_test - QT += core qml testlib diff --git a/tests/auto/qml/debugger/qv8profilerservice/qv8profilerservice.pro b/tests/auto/qml/debugger/qv8profilerservice/qv8profilerservice.pro index ccaba09..ae32870 100644 --- a/tests/auto/qml/debugger/qv8profilerservice/qv8profilerservice.pro +++ b/tests/auto/qml/debugger/qv8profilerservice/qv8profilerservice.pro @@ -10,7 +10,5 @@ include(../shared/debugutil.pri) TESTDATA = data/* -CONFIG += parallel_test - QT += qml testlib diff --git a/tests/auto/qml/qqmlcomponent/qqmlcomponent.pro b/tests/auto/qml/qqmlcomponent/qqmlcomponent.pro index 6667513..9f8c8a4 100644 --- a/tests/auto/qml/qqmlcomponent/qqmlcomponent.pro +++ b/tests/auto/qml/qqmlcomponent/qqmlcomponent.pro @@ -12,6 +12,4 @@ include (../../shared/util.pri) TESTDATA = data/* -CONFIG += parallel_test - QT += core-private gui-private qml-private quick-private network testlib diff --git a/tests/auto/qml/qqmlecmascript/qqmlecmascript.pro b/tests/auto/qml/qqmlecmascript/qqmlecmascript.pro index 553dc43..42c7bd9 100644 --- a/tests/auto/qml/qqmlecmascript/qqmlecmascript.pro +++ b/tests/auto/qml/qqmlecmascript/qqmlecmascript.pro @@ -16,5 +16,4 @@ include (../../shared/util.pri) TESTDATA = data/* -CONFIG += parallel_test QT += core-private gui-private v8-private qml-private network widgets testlib diff --git a/tests/auto/qml/qqmlengine/qqmlengine.pro b/tests/auto/qml/qqmlengine/qqmlengine.pro index 87e2814..52487b5 100644 --- a/tests/auto/qml/qqmlengine/qqmlengine.pro +++ b/tests/auto/qml/qqmlengine/qqmlengine.pro @@ -6,6 +6,4 @@ include (../../shared/util.pri) SOURCES += tst_qqmlengine.cpp -CONFIG += parallel_test - QT += core-private gui-private qml-private v8-private network testlib diff --git a/tests/auto/qml/qqmllanguage/qqmllanguage.pro b/tests/auto/qml/qqmllanguage/qqmllanguage.pro index 3d5b6a5..df52a45 100644 --- a/tests/auto/qml/qqmllanguage/qqmllanguage.pro +++ b/tests/auto/qml/qqmllanguage/qqmllanguage.pro @@ -12,5 +12,4 @@ SOURCES += ../../shared/testhttpserver.cpp TESTDATA = data/* -CONFIG += parallel_test QT += core-private gui-private v8-private qml-private network testlib diff --git a/tests/auto/qml/qqmlsqldatabase/qqmlsqldatabase.pro b/tests/auto/qml/qqmlsqldatabase/qqmlsqldatabase.pro index f784877..665a051 100644 --- a/tests/auto/qml/qqmlsqldatabase/qqmlsqldatabase.pro +++ b/tests/auto/qml/qqmlsqldatabase/qqmlsqldatabase.pro @@ -6,8 +6,6 @@ SOURCES += tst_qqmlsqldatabase.cpp include (../../shared/util.pri) -CONFIG += parallel_test - TESTDATA = data/* QT += core-private gui-private v8-private qml-private quick-private sql testlib diff --git a/tests/auto/qml/qqmlxmlhttprequest/qqmlxmlhttprequest.pro b/tests/auto/qml/qqmlxmlhttprequest/qqmlxmlhttprequest.pro index 8f3b2e0..44b2963 100644 --- a/tests/auto/qml/qqmlxmlhttprequest/qqmlxmlhttprequest.pro +++ b/tests/auto/qml/qqmlxmlhttprequest/qqmlxmlhttprequest.pro @@ -12,6 +12,4 @@ include (../../shared/util.pri) TESTDATA = data/* -CONFIG += parallel_test - QT += core-private gui-private qml-private network testlib diff --git a/tests/auto/qml/qquicklistmodelworkerscript/qquicklistmodelworkerscript.pro b/tests/auto/qml/qquicklistmodelworkerscript/qquicklistmodelworkerscript.pro index a8ca9a6..30ace38 100644 --- a/tests/auto/qml/qquicklistmodelworkerscript/qquicklistmodelworkerscript.pro +++ b/tests/auto/qml/qquicklistmodelworkerscript/qquicklistmodelworkerscript.pro @@ -8,6 +8,4 @@ include (../../shared/util.pri) TESTDATA = data/* -CONFIG += parallel_test - QT += core-private gui-private v8-private qml-private quick-private testlib diff --git a/tests/auto/quick/qquickanimatedimage/qquickanimatedimage.pro b/tests/auto/quick/qquickanimatedimage/qquickanimatedimage.pro index e2d68f1..5792626 100644 --- a/tests/auto/quick/qquickanimatedimage/qquickanimatedimage.pro +++ b/tests/auto/quick/qquickanimatedimage/qquickanimatedimage.pro @@ -10,6 +10,4 @@ macx:CONFIG -= app_bundle TESTDATA = data/* -CONFIG += parallel_test - QT += core-private gui-private qml-private quick-private network testlib diff --git a/tests/auto/quick/qquickborderimage/qquickborderimage.pro b/tests/auto/quick/qquickborderimage/qquickborderimage.pro index 998b66f..3e16063 100644 --- a/tests/auto/quick/qquickborderimage/qquickborderimage.pro +++ b/tests/auto/quick/qquickborderimage/qquickborderimage.pro @@ -10,6 +10,4 @@ include (../../shared/util.pri) TESTDATA = data/* -CONFIG += parallel_test - QT += core-private gui-private qml-private quick-private network testlib diff --git a/tests/auto/quick/qquickfontloader/qquickfontloader.pro b/tests/auto/quick/qquickfontloader/qquickfontloader.pro index 2eeb286..cea5b55 100644 --- a/tests/auto/quick/qquickfontloader/qquickfontloader.pro +++ b/tests/auto/quick/qquickfontloader/qquickfontloader.pro @@ -10,6 +10,4 @@ include (../../shared/util.pri) TESTDATA = data/* -CONFIG += parallel_test - QT += core-private gui-private qml-private quick-private network testlib diff --git a/tests/auto/quick/qquickimage/qquickimage.pro b/tests/auto/quick/qquickimage/qquickimage.pro index e0d309d..baf51c5 100644 --- a/tests/auto/quick/qquickimage/qquickimage.pro +++ b/tests/auto/quick/qquickimage/qquickimage.pro @@ -11,6 +11,5 @@ include (../shared/util.pri) TESTDATA = data/* -CONFIG += parallel_test QT += core-private gui-private qml-private quick-private network testlib CONFIG += insignificant_test diff --git a/tests/auto/quick/qquickitem/qquickitem.pro b/tests/auto/quick/qquickitem/qquickitem.pro index ee40be6..c0d9387 100644 --- a/tests/auto/quick/qquickitem/qquickitem.pro +++ b/tests/auto/quick/qquickitem/qquickitem.pro @@ -8,5 +8,4 @@ macx:CONFIG -= app_bundle TESTDATA = data/* -CONFIG += parallel_test QT += core-private gui-private v8-private qml-private quick-private testlib diff --git a/tests/auto/quick/qquickpathview/qquickpathview.pro b/tests/auto/quick/qquickpathview/qquickpathview.pro index 0f2ac8f..02ce905 100644 --- a/tests/auto/quick/qquickpathview/qquickpathview.pro +++ b/tests/auto/quick/qquickpathview/qquickpathview.pro @@ -9,5 +9,4 @@ include (../shared/util.pri) TESTDATA = data/* -CONFIG += parallel_test QT += core-private gui-private v8-private qml-private quick-private widgets testlib diff --git a/tests/auto/quick/qquickpixmapcache/qquickpixmapcache.pro b/tests/auto/quick/qquickpixmapcache/qquickpixmapcache.pro index 5ac7f1c..03d7eef 100644 --- a/tests/auto/quick/qquickpixmapcache/qquickpixmapcache.pro +++ b/tests/auto/quick/qquickpixmapcache/qquickpixmapcache.pro @@ -14,7 +14,6 @@ TESTDATA = data/* # QMAKE_CXXFLAGS = -fprofile-arcs -ftest-coverage # LIBS += -lgcov -CONFIG += parallel_test linux-*:system(". /etc/lsb-release && [ $DISTRIB_CODENAME = lucid ]"):CONFIG += insignificant_test # QTBUG-25307 QT += core-private gui-private qml-private quick-private network testlib concurrent diff --git a/tests/auto/quick/qquicktext/qquicktext.pro b/tests/auto/quick/qquicktext/qquicktext.pro index 8932664..e2cf042 100644 --- a/tests/auto/quick/qquicktext/qquicktext.pro +++ b/tests/auto/quick/qquicktext/qquicktext.pro @@ -12,6 +12,4 @@ include (../../shared/util.pri) TESTDATA = data/* -CONFIG += parallel_test - QT += core-private gui-private v8-private qml-private quick-private network testlib -- 2.7.4