From 33fe2cf23f4fc7aa1b2576dd09f8e9154e0db0ea Mon Sep 17 00:00:00 2001 From: "Bradley T. Hughes" Date: Thu, 16 Feb 2012 09:22:39 +0100 Subject: Skip hanging/failing tst_QApplication tests on Mac OS X The first block of tst_QApplication::quitOnLastWindowClosed() hangs on Mac OS X, so skip that block for now. tst_QApplication::testDeleteLAter() both hangs and fails on Mac OS X, so skip the test and XFAIL the failure. Task-number: QTBUG-24318 Task-number: QTBUG-24319 Change-Id: Ice11292d84e63215f1bb9e03f3ef369943d1d887 Reviewed-by: Rohan McGovern Reviewed-by: Jason McDonald --- tests/auto/widgets/kernel/qapplication/test/test.pro | 2 -- tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp | 6 ++++++ 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'tests/auto/widgets/kernel') diff --git a/tests/auto/widgets/kernel/qapplication/test/test.pro b/tests/auto/widgets/kernel/qapplication/test/test.pro index 9f6db3cd3e..61035cc24b 100644 --- a/tests/auto/widgets/kernel/qapplication/test/test.pro +++ b/tests/auto/widgets/kernel/qapplication/test/test.pro @@ -14,8 +14,6 @@ win32 { } } -mac*:CONFIG+=insignificant_test - TESTDATA = ../test/test.pro ../tmp/README SUBPROGRAMS = desktopsettingsaware modal diff --git a/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp b/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp index fcb6b93e99..fc38840bf7 100644 --- a/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp +++ b/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp @@ -601,6 +601,8 @@ public slots: void tst_QApplication::quitOnLastWindowClosed() { +#ifndef Q_OS_MAC + // Test hangs on Mac OS X, see QTBUG-24319 { int argc = 0; QApplication app(argc, 0, QApplication::GuiServer); @@ -615,6 +617,7 @@ void tst_QApplication::quitOnLastWindowClosed() // lastWindowClosed() signal should only be sent after the last dialog is closed QCOMPARE(appSpy.count(), 2); } +#endif { int argc = 0; QApplication app(argc, 0, QApplication::GuiServer); @@ -1204,6 +1207,9 @@ void DeleteLaterWidget::checkDeleteLater() void tst_QApplication::testDeleteLater() { +#ifdef Q_OS_MAC + QSKIP("This test fails and then hangs on Mac OS X, see QTBUG-24318"); +#endif int argc = 0; QApplication app(argc, 0, QApplication::GuiServer); connect(&app, SIGNAL(lastWindowClosed()), &app, SLOT(quit())); -- cgit v1.2.3