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>

diff --git a/tests/auto/declarative/qsgborderimage/qsgborderimage.pro b/tests/auto/declarative/qsgborderimage/qsgborderimage.pro
index 5ce2efd..65200a9 100644 (file)
--- 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 c2629c8..48cf8b6 100644 (file)
--- 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 0772829..4b7b436 100644 (file)
--- 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 0d43d11..046baca 100644 (file)
--- 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 06f8142..9152067 100644 (file)
--- 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 45ba723..a04c079 100644 (file)
--- 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