diff options
| author | Sergio Ahumada <sergio.ahumada@nokia.com> | 2012-07-13 08:23:34 (GMT) |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-16 03:05:17 (GMT) |
| commit | 4dee44e0960108751d202dd6b4d8d26b336b7576 (patch) | |
| tree | c02a192e0a032c770cb8dab9d751c322db32483b /tests/auto/macgui | |
| parent | fd4558ce23868ca03307152008277c13cf658792 (diff) | |
| download | Qt-4dee44e0960108751d202dd6b4d8d26b336b7576.zip Qt-4dee44e0960108751d202dd6b4d8d26b336b7576.tar.gz Qt-4dee44e0960108751d202dd6b4d8d26b336b7576.tar.bz2 | |
tests: Re-enable tst_MacGui test.
The test has one stable failure. Mark this with QEXPECT_FAIL and
re-enable the test.
Task-number: QTBUG-26514
Change-Id: I6faeda44224f2010ed836425a787269bfe483168
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'tests/auto/macgui')
| -rw-r--r-- | tests/auto/macgui/macgui.pro | 2 | ||||
| -rw-r--r-- | tests/auto/macgui/tst_macgui.cpp | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/tests/auto/macgui/macgui.pro b/tests/auto/macgui/macgui.pro index 095a507..2510e0f 100644 --- a/tests/auto/macgui/macgui.pro +++ b/tests/auto/macgui/macgui.pro @@ -8,5 +8,3 @@ SOURCES += tst_macgui.cpp guitest.cpp HEADERS += guitest.h requires(mac) - -CONFIG+=insignificant_test # QTQAINFRA-428 diff --git a/tests/auto/macgui/tst_macgui.cpp b/tests/auto/macgui/tst_macgui.cpp index bf12a9d..d8638cb 100644 --- a/tests/auto/macgui/tst_macgui.cpp +++ b/tests/auto/macgui/tst_macgui.cpp @@ -102,6 +102,9 @@ void tst_MacGui::scrollbarPainting() QPixmap pixmap = grabWindowContents(&colorWidget); QVERIFY(isContent(pixmap.toImage(), verticalScrollbar.geometry(), GuiTester::Horizontal)); +#ifdef Q_OS_MAC + QEXPECT_FAIL("", "QTBUG-26514", Abort); +#endif QVERIFY(isContent(pixmap.toImage(), horizontalScrollbar.geometry(), GuiTester::Vertical)); } |