aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorYann Bodson <yann.bodson@nokia.com>2011-05-18 16:16:00 +1000
committerYann Bodson <yann.bodson@nokia.com>2011-05-18 16:16:00 +1000
commitc83c123579e3064d5f9ed7333d2b4303ecf7261a (patch)
treee6942504fae8097edf9234bcc406ae283f248d90 /tests
parent5a59bc11bc23b8b99d76860fc77935175770b1a8 (diff)
Skip mirror autotests while QTBUG-19351 and QTBUG-19252 are not resolved.
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/declarative/qsganimatedimage/tst_qsganimatedimage.cpp5
-rw-r--r--tests/auto/declarative/qsgborderimage/tst_qsgborderimage.cpp2
-rw-r--r--tests/auto/declarative/qsgimage/tst_qsgimage.cpp2
3 files changed, 4 insertions, 5 deletions
diff --git a/tests/auto/declarative/qsganimatedimage/tst_qsganimatedimage.cpp b/tests/auto/declarative/qsganimatedimage/tst_qsganimatedimage.cpp
index a88a275946..739e890721 100644
--- 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 8fd40e3138..2bd15c1094 100644
--- 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 f771ec7311..ff5de4baf5 100644
--- 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;