aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorToby Tomkins <toby.tomkins@nokia.com>2011-10-17 14:46:07 +1000
committerQt by Nokia <qt-info@nokia.com>2011-10-17 07:49:25 +0200
commitd06594d69bb35aacc00693e7480295cb33d1fb6f (patch)
treec9d2cfcd0345f92e578767c1086336d080d91ec4
parentbd0f948a40da1fa04f1035b2278856e2b8649ab1 (diff)
Remove insignificant flag from tests, some failing test cleanup.
Task-number: QTBUG-21054 QTBUG-21004 Change-Id: I9d1a3ca99363949eee952e1bd09aabef82fc1831 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
-rw-r--r--tests/auto/declarative/qsgborderimage/qsgborderimage.pro2
-rw-r--r--tests/auto/declarative/qsgflickable/qsgflickable.pro2
-rw-r--r--tests/auto/declarative/qsgfocusscope/qsgfocusscope.pro2
-rw-r--r--tests/auto/declarative/qsgfocusscope/tst_qsgfocusscope.cpp2
-rw-r--r--tests/auto/declarative/qsgpathview/qsgpathview.pro2
-rw-r--r--tests/auto/declarative/qsgtext/qsgtext.pro2
6 files changed, 2 insertions, 10 deletions
diff --git a/tests/auto/declarative/qsgborderimage/qsgborderimage.pro b/tests/auto/declarative/qsgborderimage/qsgborderimage.pro
index 5ce2efd528..65200a9a93 100644
--- a/tests/auto/declarative/qsgborderimage/qsgborderimage.pro
+++ b/tests/auto/declarative/qsgborderimage/qsgborderimage.pro
@@ -12,5 +12,3 @@ DEPLOYMENT += testDataFiles
CONFIG += parallel_test
QT += core-private gui-private declarative-private network widgets testlib
-
-qpa:CONFIG+=insignificant_test # QTBUG-21004 fails, unstably
diff --git a/tests/auto/declarative/qsgflickable/qsgflickable.pro b/tests/auto/declarative/qsgflickable/qsgflickable.pro
index c2629c8c1b..48cf8b6335 100644
--- a/tests/auto/declarative/qsgflickable/qsgflickable.pro
+++ b/tests/auto/declarative/qsgflickable/qsgflickable.pro
@@ -9,6 +9,4 @@ testDataFiles.path = .
DEPLOYMENT += testDataFiles
CONFIG += parallel_test
-#temporary
-CONFIG += insignificant_test
QT += core-private gui-private v8-private declarative-private testlib
diff --git a/tests/auto/declarative/qsgfocusscope/qsgfocusscope.pro b/tests/auto/declarative/qsgfocusscope/qsgfocusscope.pro
index 0772829b2a..4b7b436ac6 100644
--- a/tests/auto/declarative/qsgfocusscope/qsgfocusscope.pro
+++ b/tests/auto/declarative/qsgfocusscope/qsgfocusscope.pro
@@ -8,5 +8,3 @@ testDataFiles.path = .
DEPLOYMENT += testDataFiles
QT += core-private gui-private declarative-private testlib
-
-qpa:contains(QT_CONFIG,xcb):CONFIG+=insignificant_test # QTBUG-21054, unstable
diff --git a/tests/auto/declarative/qsgfocusscope/tst_qsgfocusscope.cpp b/tests/auto/declarative/qsgfocusscope/tst_qsgfocusscope.cpp
index 0d43d110af..046bacab6d 100644
--- a/tests/auto/declarative/qsgfocusscope/tst_qsgfocusscope.cpp
+++ b/tests/auto/declarative/qsgfocusscope/tst_qsgfocusscope.cpp
@@ -559,7 +559,7 @@ void tst_qsgfocusscope::canvasFocus()
QSignalSpy scope2ActiveFocusSpy(scope2, SIGNAL(activeFocusChanged(bool)));
QSignalSpy item2ActiveFocusSpy(item2, SIGNAL(activeFocusChanged(bool)));
- QEXPECT_FAIL("", "Root item hasFocus returns true already", Abort);
+ QEXPECT_FAIL("", "QTBUG-21054 - Root item hasFocus returns true already", Abort);
QCOMPARE(rootItem->hasFocus(), false);
QCOMPARE(rootItem->hasActiveFocus(), false);
diff --git a/tests/auto/declarative/qsgpathview/qsgpathview.pro b/tests/auto/declarative/qsgpathview/qsgpathview.pro
index 06f8142f84..91520673f7 100644
--- a/tests/auto/declarative/qsgpathview/qsgpathview.pro
+++ b/tests/auto/declarative/qsgpathview/qsgpathview.pro
@@ -9,6 +9,4 @@ testDataFiles.path = .
DEPLOYMENT += testDataFiles
CONFIG += parallel_test
-#temporary
-CONFIG += insignificant_test
QT += core-private gui-private v8-private declarative-private widgets testlib
diff --git a/tests/auto/declarative/qsgtext/qsgtext.pro b/tests/auto/declarative/qsgtext/qsgtext.pro
index 45ba723863..a04c079ef2 100644
--- a/tests/auto/declarative/qsgtext/qsgtext.pro
+++ b/tests/auto/declarative/qsgtext/qsgtext.pro
@@ -12,6 +12,6 @@ testDataFiles.files = data
testDataFiles.path = .
DEPLOYMENT += testDataFiles
-CONFIG += insignificant_test parallel_test
+CONFIG += parallel_test
QT += core-private gui-private v8-private declarative-private widgets-private opengl-private network testlib