Skip mirror autotests while QTBUG-19351 and QTBUG-19252 are not resolved.

diff --git a/tests/auto/declarative/qsganimatedimage/tst_qsganimatedimage.cpp b/tests/auto/declarative/qsganimatedimage/tst_qsganimatedimage.cpp
index a88a275..739e890 100644 (file)
--- a/tests/auto/declarative/qsganimatedimage/tst_qsganimatedimage.cpp
+++ b/tests/auto/declarative/qsganimatedimage/tst_qsganimatedimage.cpp
@@ -209,9 +209,8 @@ void tst_qsganimatedimage::mirror_notRunning()
     anim->setProperty("mirror", true);
     screenshot = canvas->renderPixmap();
 
-    // QEXPECT_FAIL("", "QTBUG-19252", Abort);
-    // TODO: re-enable when QTBUG-19351 is resolved
-    // QCOMPARE(screenshot, expected);
+    QSKIP("Skip while QTBUG-19351 and QTBUG-19252 are not resolved", SkipSingle);
+    QCOMPARE(screenshot, expected);
 
     // mirroring should not change the current frame or playing status
     QCOMPARE(anim->currentFrame(), frame);

diff --git a/tests/auto/declarative/qsgborderimage/tst_qsgborderimage.cpp b/tests/auto/declarative/qsgborderimage/tst_qsgborderimage.cpp
index 8fd40e3..2bd15c1 100644 (file)
--- a/tests/auto/declarative/qsgborderimage/tst_qsgborderimage.cpp
+++ b/tests/auto/declarative/qsgborderimage/tst_qsgborderimage.cpp
@@ -238,7 +238,7 @@ void tst_qsgborderimage::mirror()
     image->setProperty("mirror", true);
     QPixmap mirrored;
 
-    QEXPECT_FAIL("", "QTBUG-19252", Abort);
+    QSKIP("Skip while QTBUG-19351 and QTBUG-19252 are not resolved", SkipSingle);
     QCOMPARE(screenshot, mirrored);
 
     delete canvas;

diff --git a/tests/auto/declarative/qsgimage/tst_qsgimage.cpp b/tests/auto/declarative/qsgimage/tst_qsgimage.cpp
index f771ec7..ff5de4b 100644 (file)
--- a/tests/auto/declarative/qsgimage/tst_qsgimage.cpp
+++ b/tests/auto/declarative/qsgimage/tst_qsgimage.cpp
@@ -337,7 +337,7 @@ void tst_qsgimage::mirror()
             break;
     }
 
-    QEXPECT_FAIL("", "QTBUG-19351", Abort);
+    QSKIP("Skip while QTBUG-19351 and QTBUG-19252 are not resolved", SkipSingle);
     QCOMPARE(screenshot, expected);
 
     delete canvas;