diff options
author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2011-11-16 11:21:23 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-21 11:31:35 +0100 |
commit | 84f0add9b3f8390d18b23a445bacb7c3abaedc10 (patch) | |
tree | d10ffa2e55206de0c63c7911a4aac6919b7759aa /tests/auto/auto.pro | |
parent | 249c4fc8e964876081fa3dab097573aab891f8ef (diff) |
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 <marius.storm-olsen@nokia.com>
Diffstat (limited to 'tests/auto/auto.pro')
-rw-r--r-- | tests/auto/auto.pro | 16 |
1 files changed, 16 insertions, 0 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 +} |