From d7a102ac65951d646fc08fcc1bec13ee0cd8f866 Mon Sep 17 00:00:00 2001 From: Jason McDonald Date: Sat, 21 Apr 2012 00:25:11 +1000 Subject: [PATCH] Start running some disabled tests again on Mac OS. These tests were disabled when trying to get CI working on Mac OS because they asserted or crashed. Now that CI is working well on Mac OS, start running these tests again, initially as insignificant tests. CI results will then be used to determine whether the tests can be made significant. Change-Id: Ife411e6b8c84ade45c865ef35f3ae0071d6f8d2b Reviewed-by: Sergio Ahumada Reviewed-by: Bradley T. Hughes Reviewed-by: Rohan McGovern --- tests/auto/corelib/itemmodels/itemmodels.pro | 2 -- .../itemmodels/qabstractitemmodel/qabstractitemmodel.pro | 2 ++ tests/auto/gui/text/qtextlayout/qtextlayout.pro | 2 ++ tests/auto/gui/text/text.pro | 4 ---- tests/auto/other/lancelot/lancelot.pro | 2 ++ tests/auto/other/other.pro | 2 -- tests/auto/widgets/kernel/kernel.pro | 2 -- tests/auto/widgets/kernel/qwidget/qwidget.pro | 2 +- 8 files changed, 7 insertions(+), 11 deletions(-) diff --git a/tests/auto/corelib/itemmodels/itemmodels.pro b/tests/auto/corelib/itemmodels/itemmodels.pro index 851035e949..418c5e1678 100644 --- a/tests/auto/corelib/itemmodels/itemmodels.pro +++ b/tests/auto/corelib/itemmodels/itemmodels.pro @@ -7,5 +7,3 @@ SUBDIRS = qabstractitemmodel \ qitemselectionmodel \ qsortfilterproxymodel \ qstringlistmodel - -mac: qabstractitemmodel.CONFIG = no_check_target # QTBUG-22748 diff --git a/tests/auto/corelib/itemmodels/qabstractitemmodel/qabstractitemmodel.pro b/tests/auto/corelib/itemmodels/qabstractitemmodel/qabstractitemmodel.pro index 9e59251379..79a13ed354 100644 --- a/tests/auto/corelib/itemmodels/qabstractitemmodel/qabstractitemmodel.pro +++ b/tests/auto/corelib/itemmodels/qabstractitemmodel/qabstractitemmodel.pro @@ -6,3 +6,5 @@ mtdir = ../../../other/modeltest INCLUDEPATH += $$PWD/$${mtdir} SOURCES = tst_qabstractitemmodel.cpp $${mtdir}/dynamictreemodel.cpp $${mtdir}/modeltest.cpp HEADERS = $${mtdir}/dynamictreemodel.h $${mtdir}/modeltest.h + +mac:CONFIG+=insignificant_test # QTBUG-22748 diff --git a/tests/auto/gui/text/qtextlayout/qtextlayout.pro b/tests/auto/gui/text/qtextlayout/qtextlayout.pro index f35239bc6a..7addbe88dc 100644 --- a/tests/auto/gui/text/qtextlayout/qtextlayout.pro +++ b/tests/auto/gui/text/qtextlayout/qtextlayout.pro @@ -5,3 +5,5 @@ HEADERS += SOURCES += tst_qtextlayout.cpp DEFINES += QT_COMPILES_IN_HARFBUZZ INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/harfbuzz/src + +mac:CONFIG+=insignificant_test # QTBUG-23050 diff --git a/tests/auto/gui/text/text.pro b/tests/auto/gui/text/text.pro index c24fe7553d..5055ab61a3 100644 --- a/tests/auto/gui/text/text.pro +++ b/tests/auto/gui/text/text.pro @@ -31,7 +31,3 @@ win32:SUBDIRS -= qtextpiecetable qstatictext \ qtextlayout \ qtextpiecetable \ - -mac { - qtextlayout.CONFIG = no_check_target # QTBUG-23050 -} diff --git a/tests/auto/other/lancelot/lancelot.pro b/tests/auto/other/lancelot/lancelot.pro index 534452ed14..e28e4a704e 100644 --- a/tests/auto/other/lancelot/lancelot.pro +++ b/tests/auto/other/lancelot/lancelot.pro @@ -11,3 +11,5 @@ RESOURCES += images.qrc include($$PWD/../../../baselineserver/shared/qbaselinetest.pri) TESTDATA += scripts/* + +mac:CONFIG+=insignificant_test # QTBUG-22792 diff --git a/tests/auto/other/other.pro b/tests/auto/other/other.pro index b6154a8ddc..8c86a95c59 100644 --- a/tests/auto/other/other.pro +++ b/tests/auto/other/other.pro @@ -42,5 +42,3 @@ wince*|!contains(QT_CONFIG, accessibility):SUBDIRS -= qaccessibility qdirectpainter !linux*-g++*:SUBDIRS -= exceptionsafety_objects - -mac: lancelot.CONFIG = no_check_target # QTBUG-22792 diff --git a/tests/auto/widgets/kernel/kernel.pro b/tests/auto/widgets/kernel/kernel.pro index cf909b7e87..e1c245d9d1 100644 --- a/tests/auto/widgets/kernel/kernel.pro +++ b/tests/auto/widgets/kernel/kernel.pro @@ -17,5 +17,3 @@ SUBDIRS=\ qshortcut \ SUBDIRS -= qsound - -mac: qwidget.CONFIG += no_check_target # crashes, see QTBUG-23695 diff --git a/tests/auto/widgets/kernel/qwidget/qwidget.pro b/tests/auto/widgets/kernel/qwidget/qwidget.pro index d0f0bd3faf..678796d2e5 100644 --- a/tests/auto/widgets/kernel/qwidget/qwidget.pro +++ b/tests/auto/widgets/kernel/qwidget/qwidget.pro @@ -21,4 +21,4 @@ x11 { !wince*:win32: LIBS += -luser32 -lgdi32 -CONFIG+=insignificant_test # QTBUG-25300 +CONFIG+=insignificant_test # QTBUG-25300, QTBUG-23695