qiurui
/
qtbase
mirror of https://github.com/qt/qtbase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 <rohan.mcgovern@nokia.com>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
This commit is contained in:
Bradley T. Hughes 2012-02-16 09:22:39 +01:00 committed by Qt by Nokia
parent 5efb3c2707
commit 33fe2cf23f
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/auto/widgets/kernel/qapplication/test/test.pro
View File

@ -14,8 +14,6 @@ win32 {
}
}
mac*:CONFIG+=insignificant_test
TESTDATA = ../test/test.pro ../tmp/README
SUBPROGRAMS = desktopsettingsaware modal

6
tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp
View File

@ -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()));