From 4dee44e0960108751d202dd6b4d8d26b336b7576 Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Fri, 13 Jul 2012 10:23:34 +0200 Subject: 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 --- tests/auto/macgui/macgui.pro | 2 -- 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)); } -- cgit v0.12