1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Re-enable the corelib autotests on Mac OS X

Browse Source 
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>
This commit is contained in:
Bradley T. Hughes 2011-11-16 11:21:23 +01:00 committed by Qt by Nokia
parent 249c4fc8e9
commit 84f0add9b3
11 changed files with 34 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tests/auto/auto.pro
View File

@ -19,3 +19,19 @@ cross_compile: SUBDIRS -= tools
!contains(QT_CONFIG, opengl): SUBDIRS -= opengl !contains(QT_CONFIG, opengl): SUBDIRS -= opengl
!unix|embedded|!contains(QT_CONFIG, dbus): SUBDIRS -= dbus !unix|embedded|!contains(QT_CONFIG, dbus): SUBDIRS -= dbus
!contains(QT_CONFIG, v8): SUBDIRS -= v8 !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
}

2
tests/auto/corelib/io/qfilesystemwatcher/qfilesystemwatcher.pro
View File

@ -2,3 +2,5 @@ CONFIG += testcase parallel_test
TARGET = tst_qfilesystemwatcher TARGET = tst_qfilesystemwatcher
QT = core testlib QT = core testlib
SOURCES = tst_qfilesystemwatcher.cpp SOURCES = tst_qfilesystemwatcher.cpp
mac: CONFIG += insignificant_test # QTBUG-22744

2
tests/auto/corelib/io/qiodevice/qiodevice.pro
View File

@ -13,3 +13,5 @@ wince* {
DEFINES += SRCDIR=\\\"$$PWD/\\\" DEFINES += SRCDIR=\\\"$$PWD/\\\"
} }
MOC_DIR=tmp MOC_DIR=tmp
mac: CONFIG += insignificant_test # QTBUG-22766

2
tests/auto/corelib/io/qsettings/qsettings.pro
View File

@ -5,3 +5,5 @@ SOURCES = tst_qsettings.cpp
RESOURCES += qsettings.qrc RESOURCES += qsettings.qrc
win32-msvc*:LIBS += advapi32.lib win32-msvc*:LIBS += advapi32.lib
mac: CONFIG += insignificant_test # QTBUG-22745

2
tests/auto/corelib/io/qtextstream/test/test.pro
View File

@ -22,3 +22,5 @@ wince* {
} else { } else {
DEFINES += SRCDIR=\\\"$$PWD/../\\\" DEFINES += SRCDIR=\\\"$$PWD/../\\\"
} }
mac: CONFIG += insignificant_test # QTBUG-22767

2
tests/auto/corelib/kernel/kernel.pro
View File

@ -23,3 +23,5 @@ SUBDIRS=\
# This test is only applicable on Windows # This test is only applicable on Windows
!win32*:SUBDIRS -= qwineventnotifier !win32*:SUBDIRS -= qwineventnotifier
mac: qabstractitemmodel.CONFIG = no_check_target # QTBUG-22748

2
tests/auto/corelib/kernel/qsocketnotifier/qsocketnotifier.pro
View File

@ -6,3 +6,5 @@ SOURCES = tst_qsocketnotifier.cpp
requires(contains(QT_CONFIG,private_tests)) requires(contains(QT_CONFIG,private_tests))
include(../../../network/socket/platformsocketengine/platformsocketengine.pri) include(../../../network/socket/platformsocketengine/platformsocketengine.pri)
mac: CONFIG += insignificant_test # QTBUG-22746

2
tests/auto/corelib/kernel/qvariant/qvariant.pro
View File

@ -2,3 +2,5 @@ CONFIG += testcase
TARGET = tst_qvariant TARGET = tst_qvariant
QT = widgets network testlib QT = widgets network testlib
SOURCES = tst_qvariant.cpp SOURCES = tst_qvariant.cpp
mac: CONFIG += insignificant_test # QTBUG-QTBUG-22747

2
tests/auto/corelib/plugin/qpluginloader/tst/tst.pro
View File

@ -18,3 +18,5 @@ wince* {
addFiles.path = bin addFiles.path = bin
DEPLOYMENT += addFiles DEPLOYMENT += addFiles
} }
mac: CONFIG += insignificant_test # QTBUG-22765

2
tests/auto/corelib/tools/qlocale/test/test.pro
View File

@ -18,3 +18,5 @@ SOURCES = ../tst_qlocale.cpp
addFiles.path = "\\Program Files\\tst_qlocale" addFiles.path = "\\Program Files\\tst_qlocale"
DEPLOYMENT += addFiles DEPLOYMENT += addFiles
} }
mac: CONFIG += insignificant_test # QTBUG-22769

3
tests/tests.pro
View File

@ -4,6 +4,3 @@ SUBDIRS = auto
# benchmarks in debug mode is rarely sensible # benchmarks in debug mode is rarely sensible
# benchmarks are not sensible for code coverage (here with tool testcocoon) # benchmarks are not sensible for code coverage (here with tool testcocoon)
!testcocoon:contains(QT_CONFIG,release):SUBDIRS += benchmarks !testcocoon:contains(QT_CONFIG,release):SUBDIRS += benchmarks
# disable 'make check' on Mac OS X for the time being
mac: auto.CONFIG += no_check_target