diff options
| author | Toby Tomkins <toby.tomkins@nokia.com> | 2011-10-17 15:52:18 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-19 01:13:12 +0200 |
| commit | f383c47dd53e867f182f3d3e0725a03f7f873479 (patch) | |
| tree | b0fab3e155457e396c5f5162da175ba246d34a6f /tests | |
| parent | da371e61917f09de40ec39d82f68dfca2cdb5a25 (diff) | |
Correct behavior for passing test, ifdef out failing test.
Task-number: QTBUG-21005, QTBUG-21688
Change-Id: I2b6ada399e7d26045c7f0a767082892332a6a378
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/declarative/qsgimage/qsgimage.pro | 2 | ||||
| -rw-r--r-- | tests/auto/declarative/qsgimage/tst_qsgimage.cpp | 6 |
2 files changed, 1 insertions, 7 deletions
diff --git a/tests/auto/declarative/qsgimage/qsgimage.pro b/tests/auto/declarative/qsgimage/qsgimage.pro index b1ca1dbbf6..11abb9fa18 100644 --- a/tests/auto/declarative/qsgimage/qsgimage.pro +++ b/tests/auto/declarative/qsgimage/qsgimage.pro @@ -10,6 +10,4 @@ testDataFiles.path = . DEPLOYMENT += testDataFiles CONFIG += parallel_test -#temporary -CONFIG += insignificant_test QT += core-private gui-private declarative-private network testlib diff --git a/tests/auto/declarative/qsgimage/tst_qsgimage.cpp b/tests/auto/declarative/qsgimage/tst_qsgimage.cpp index fd22f48684..7a850db7a8 100644 --- a/tests/auto/declarative/qsgimage/tst_qsgimage.cpp +++ b/tests/auto/declarative/qsgimage/tst_qsgimage.cpp @@ -475,9 +475,7 @@ void tst_qsgimage::tiling_QTBUG_6716() QImage img = canvas->grabFrameBuffer(); for (int x = 0; x < tiling->width(); ++x) { for (int y = 0; y < tiling->height(); ++y) { -#ifdef Q_WS_QPA - QEXPECT_FAIL("", "QTBUG-21005 fails", Abort); -#endif + QEXPECT_FAIL("horizontal_tiling", "QTBUG-21005 - stable failing test", Abort); QVERIFY(img.pixel(x, y) == qRgb(0, 255, 0)); } } @@ -487,9 +485,7 @@ void tst_qsgimage::tiling_QTBUG_6716() void tst_qsgimage::tiling_QTBUG_6716_data() { QTest::addColumn<QString>("source"); -#ifdef QT_BUILD_INTERNAL // QTBUG-21688 - unstable test on developer build QTest::newRow("vertical_tiling") << "vtiling.qml"; -#endif QTest::newRow("horizontal_tiling") << "htiling.qml"; } |