From 84f0add9b3f8390d18b23a445bacb7c3abaedc10 Mon Sep 17 00:00:00 2001 From: "Bradley T. Hughes" Date: Wed, 16 Nov 2011 11:21:23 +0100 Subject: Re-enable the corelib autotests on Mac OS X This is the first change to re-enable the autotests for the individual qtbase modules. This means adding subdir.CONFIG=no_check_target for each module (except corelib) in tests/auto/auto.pro instead of in tests/tests.pro QFileSystemWatcher, QIODeice, QSettings, QTextStream, QSocketNotifier, QVariant, QPluginLoader, QLocale: These tests currently fail, which will block any changes that attempt to re-enable the autotests. Ignore the failures for now by marking them as insignificant. QAbstractItemModel: This test currently crashes, which can destabilize the CI system when attempting to re-enable the autotests. Skip this test for now by disabling the check target for it. Change-Id: Ie5147d5c5cfae5e7d0a495d5c4788ce92fe2e6d8 Reviewed-by: Marius Storm-Olsen --- tests/auto/auto.pro | 16 ++++++++++++++++ .../corelib/io/qfilesystemwatcher/qfilesystemwatcher.pro | 2 ++ tests/auto/corelib/io/qiodevice/qiodevice.pro | 2 ++ tests/auto/corelib/io/qsettings/qsettings.pro | 2 ++ tests/auto/corelib/io/qtextstream/test/test.pro | 2 ++ tests/auto/corelib/kernel/kernel.pro | 2 ++ .../corelib/kernel/qsocketnotifier/qsocketnotifier.pro | 2 ++ tests/auto/corelib/kernel/qvariant/qvariant.pro | 2 ++ tests/auto/corelib/plugin/qpluginloader/tst/tst.pro | 2 ++ tests/auto/corelib/tools/qlocale/test/test.pro | 2 ++ tests/tests.pro | 3 --- 11 files changed, 34 insertions(+), 3 deletions(-) diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index f2672c0d16..248197cb27 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -19,3 +19,19 @@ cross_compile: SUBDIRS -= tools !contains(QT_CONFIG, opengl): SUBDIRS -= opengl !unix|embedded|!contains(QT_CONFIG, dbus): SUBDIRS -= dbus !contains(QT_CONFIG, v8): SUBDIRS -= v8 + +# disable 'make check' on Mac OS X for the following subdirs for the time being +mac { + dbus.CONFIG += no_check_target + gui.CONFIG += no_check_target + integrationtests.CONFIG += no_check_target + network.CONFIG += no_check_target + opengl.CONFIG += no_check_target + sql.CONFIG += no_check_target + testlib.CONFIG += no_check_target + tools.CONFIG += no_check_target + v8.CONFIG += no_check_target + xml.CONFIG += no_check_target + other.CONFIG += no_check_target + widgets.CONFIG += no_check_target +} diff --git a/tests/auto/corelib/io/qfilesystemwatcher/qfilesystemwatcher.pro b/tests/auto/corelib/io/qfilesystemwatcher/qfilesystemwatcher.pro index 8ada44fdf7..e712a6ad5f 100644 --- a/tests/auto/corelib/io/qfilesystemwatcher/qfilesystemwatcher.pro +++ b/tests/auto/corelib/io/qfilesystemwatcher/qfilesystemwatcher.pro @@ -2,3 +2,5 @@ CONFIG += testcase parallel_test TARGET = tst_qfilesystemwatcher QT = core testlib SOURCES = tst_qfilesystemwatcher.cpp + +mac: CONFIG += insignificant_test # QTBUG-22744 diff --git a/tests/auto/corelib/io/qiodevice/qiodevice.pro b/tests/auto/corelib/io/qiodevice/qiodevice.pro index fa5ee1492c..2a90ca100b 100644 --- a/tests/auto/corelib/io/qiodevice/qiodevice.pro +++ b/tests/auto/corelib/io/qiodevice/qiodevice.pro @@ -13,3 +13,5 @@ wince* { DEFINES += SRCDIR=\\\"$$PWD/\\\" } MOC_DIR=tmp + +mac: CONFIG += insignificant_test # QTBUG-22766 diff --git a/tests/auto/corelib/io/qsettings/qsettings.pro b/tests/auto/corelib/io/qsettings/qsettings.pro index 1772f4b65f..ed3be0f23f 100644 --- a/tests/auto/corelib/io/qsettings/qsettings.pro +++ b/tests/auto/corelib/io/qsettings/qsettings.pro @@ -5,3 +5,5 @@ SOURCES = tst_qsettings.cpp RESOURCES += qsettings.qrc win32-msvc*:LIBS += advapi32.lib + +mac: CONFIG += insignificant_test # QTBUG-22745 diff --git a/tests/auto/corelib/io/qtextstream/test/test.pro b/tests/auto/corelib/io/qtextstream/test/test.pro index cf53f44833..def79218f2 100644 --- a/tests/auto/corelib/io/qtextstream/test/test.pro +++ b/tests/auto/corelib/io/qtextstream/test/test.pro @@ -22,3 +22,5 @@ wince* { } else { DEFINES += SRCDIR=\\\"$$PWD/../\\\" } + +mac: CONFIG += insignificant_test # QTBUG-22767 diff --git a/tests/auto/corelib/kernel/kernel.pro b/tests/auto/corelib/kernel/kernel.pro index bf0700e43e..90a5c24506 100644 --- a/tests/auto/corelib/kernel/kernel.pro +++ b/tests/auto/corelib/kernel/kernel.pro @@ -23,3 +23,5 @@ SUBDIRS=\ # This test is only applicable on Windows !win32*:SUBDIRS -= qwineventnotifier + +mac: qabstractitemmodel.CONFIG = no_check_target # QTBUG-22748 diff --git a/tests/auto/corelib/kernel/qsocketnotifier/qsocketnotifier.pro b/tests/auto/corelib/kernel/qsocketnotifier/qsocketnotifier.pro index 58e4b98af7..55f6934fc9 100644 --- a/tests/auto/corelib/kernel/qsocketnotifier/qsocketnotifier.pro +++ b/tests/auto/corelib/kernel/qsocketnotifier/qsocketnotifier.pro @@ -6,3 +6,5 @@ SOURCES = tst_qsocketnotifier.cpp requires(contains(QT_CONFIG,private_tests)) include(../../../network/socket/platformsocketengine/platformsocketengine.pri) + +mac: CONFIG += insignificant_test # QTBUG-22746 diff --git a/tests/auto/corelib/kernel/qvariant/qvariant.pro b/tests/auto/corelib/kernel/qvariant/qvariant.pro index 00932f9576..bc0a4d43e1 100644 --- a/tests/auto/corelib/kernel/qvariant/qvariant.pro +++ b/tests/auto/corelib/kernel/qvariant/qvariant.pro @@ -2,3 +2,5 @@ CONFIG += testcase TARGET = tst_qvariant QT = widgets network testlib SOURCES = tst_qvariant.cpp + +mac: CONFIG += insignificant_test # QTBUG-QTBUG-22747 diff --git a/tests/auto/corelib/plugin/qpluginloader/tst/tst.pro b/tests/auto/corelib/plugin/qpluginloader/tst/tst.pro index 2d77e538d1..0de46be2c9 100644 --- a/tests/auto/corelib/plugin/qpluginloader/tst/tst.pro +++ b/tests/auto/corelib/plugin/qpluginloader/tst/tst.pro @@ -18,3 +18,5 @@ wince* { addFiles.path = bin DEPLOYMENT += addFiles } + +mac: CONFIG += insignificant_test # QTBUG-22765 diff --git a/tests/auto/corelib/tools/qlocale/test/test.pro b/tests/auto/corelib/tools/qlocale/test/test.pro index 5c8f8c9097..4649d78c03 100644 --- a/tests/auto/corelib/tools/qlocale/test/test.pro +++ b/tests/auto/corelib/tools/qlocale/test/test.pro @@ -18,3 +18,5 @@ SOURCES = ../tst_qlocale.cpp addFiles.path = "\\Program Files\\tst_qlocale" DEPLOYMENT += addFiles } + +mac: CONFIG += insignificant_test # QTBUG-22769 diff --git a/tests/tests.pro b/tests/tests.pro index ead5f80e89..0c933681ee 100644 --- a/tests/tests.pro +++ b/tests/tests.pro @@ -4,6 +4,3 @@ SUBDIRS = auto # benchmarks in debug mode is rarely sensible # benchmarks are not sensible for code coverage (here with tool testcocoon) !testcocoon:contains(QT_CONFIG,release):SUBDIRS += benchmarks - -# disable 'make check' on Mac OS X for the time being -mac: auto.CONFIG += no_check_target -- cgit v1.2.3