From f0b922a3af47e984e4a5935e65c4243966d8dc9d Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Sat, 15 Sep 2012 12:57:56 +0200 Subject: [PATCH] test: Mark tst_QTabBar::sizeHints() failure as XFAIL The test has one stable failure on Mac OS X, so mark this with QEXPECT_FAIL and remove the QSKIP Task-number: QTBUG-22320 Task-number: QTBUG-27230 Change-Id: I7660df5770c39788792068a5b68e8236551288c4 Reviewed-by: J-P Nurmi Reviewed-by: Caroline Chao --- tests/auto/widgets/widgets/qtabbar/tst_qtabbar.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/auto/widgets/widgets/qtabbar/tst_qtabbar.cpp b/tests/auto/widgets/widgets/qtabbar/tst_qtabbar.cpp index 50536c84fb..e7210bbafe 100644 --- a/tests/auto/widgets/widgets/qtabbar/tst_qtabbar.cpp +++ b/tests/auto/widgets/widgets/qtabbar/tst_qtabbar.cpp @@ -283,7 +283,6 @@ void tst_QTabBar::setElideMode() void tst_QTabBar::sizeHints() { QTabBar tabBar; - QSKIP("To be fixed on Mac (font size below not large enough) and Linux QWS (probably too large for the screen)."); tabBar.setFont(QFont("Arial", 10)); tabBar.addTab("tab 01"); tabBar.addTab("tab 02"); @@ -299,6 +298,9 @@ void tst_QTabBar::sizeHints() tabBar.setUsesScrollButtons(false); tabBar.setElideMode(Qt::ElideNone); // qDebug() << tabBar.minimumSizeHint() << tabBar.sizeHint(); +#ifdef Q_OS_MAC + QEXPECT_FAIL("", "QTBUG-27230", Abort); +#endif QVERIFY(tabBar.minimumSizeHint().width() > 700); QVERIFY(tabBar.sizeHint().width() > 700);