From 8b900a24282a52671f270c7af31ef85f61b46863 Mon Sep 17 00:00:00 2001 From: Rohan McGovern Date: Mon, 14 May 2012 13:28:21 +1000 Subject: Removed CONFIG+=parallel_test from parallel-unsafe tests These tests are marked with CONFIG+=parallel_test, but are observed to fail sometimes if run concurrently with other tests, and pass otherwise. Change-Id: Id59209ca80c7449bdc0689af522c82ff00c4b588 Reviewed-by: Michael Brasser --- tests/auto/qml/debugger/qqmldebugjs/qqmldebugjs.pro | 2 -- tests/auto/quick/qquickitem2/qquickitem2.pro | 2 -- tests/auto/quick/qquickloader/qquickloader.pro | 2 -- 3 files changed, 6 deletions(-) diff --git a/tests/auto/qml/debugger/qqmldebugjs/qqmldebugjs.pro b/tests/auto/qml/debugger/qqmldebugjs/qqmldebugjs.pro index c06fd84e58..789735c208 100644 --- a/tests/auto/qml/debugger/qqmldebugjs/qqmldebugjs.pro +++ b/tests/auto/qml/debugger/qqmldebugjs/qqmldebugjs.pro @@ -11,8 +11,6 @@ include(../shared/debugutil.pri) TESTDATA = data/* -CONFIG += parallel_test - OTHER_FILES += data/test.qml data/test.js \ data/timer.qml \ data/exception.qml \ diff --git a/tests/auto/quick/qquickitem2/qquickitem2.pro b/tests/auto/quick/qquickitem2/qquickitem2.pro index 589d1bd568..52b4f297b4 100644 --- a/tests/auto/quick/qquickitem2/qquickitem2.pro +++ b/tests/auto/quick/qquickitem2/qquickitem2.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/qquickloader/qquickloader.pro b/tests/auto/quick/qquickloader/qquickloader.pro index 2961ed9429..32350388e8 100644 --- a/tests/auto/quick/qquickloader/qquickloader.pro +++ b/tests/auto/quick/qquickloader/qquickloader.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 -- cgit v1.2.3