diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-04-29 12:13:11 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-04-29 14:50:49 +0200 |
| commit | b27e922e1c74f467843b7b8a01c2229b0fee5367 (patch) | |
| tree | 2d47fdf22c8be0f3404f6d10fdbac44aa75bd796 /tests/auto/widgets/widgets | |
| parent | d59e9af592114f07e470dccbc92f5bb9e9cef2ab (diff) | |
test: Mark tst_menubar::task256322_highlight as XFAIL
This test is unstable on Mac OS 10.7 with developer builds, so marking
it as XFAIL if it happens to fail.
Task-number: QTBUG-30565
Change-Id: If7094c3b19299f0dbe57cb82a8614032a75573d8
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
Diffstat (limited to 'tests/auto/widgets/widgets')
| -rw-r--r-- | tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp b/tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp index d1e6693608..e7450fdd2c 100644 --- a/tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp +++ b/tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp @@ -1184,7 +1184,12 @@ void tst_QMenuBar::task256322_highlight() QTest::mouseMove(win.menuBar(), nothingCenter); QTRY_VERIFY(!menu2.isVisible()); QVERIFY(!menu.isVisible()); - QCOMPARE(win.menuBar()->activeAction(), nothing); + QAction *activeAction = win.menuBar()->activeAction(); +#ifdef Q_OS_MAC + if ((QSysInfo::MacintoshVersion >= QSysInfo::MV_10_7) && (activeAction != nothing)) + QEXPECT_FAIL("", "QTBUG-30565: Unstable test", Continue); +#endif + QCOMPARE(activeAction, nothing); QTest::mouseRelease(win.menuBar(), Qt::LeftButton, 0, nothingCenter); } |