diff options
author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2011-12-08 12:08:12 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-12-09 02:39:06 +0100 |
commit | 60e93449d2a7e6e3a10723a9a73dabc39afe0262 (patch) | |
tree | c6662b5e5bd116987599682bcc3d292fa30d38b4 | |
parent | 4ebceaba394e54a4f43578e46839e3057e7e802d (diff) | |
download | qtbase-60e93449d2a7e6e3a10723a9a73dabc39afe0262.tar.gz |
Re-enable 'check' target for tests/auto/gui on Mac OS X
Failing tests are marked with CONFIG+=insignificant_test.
tst_QTextLayout currently asserts, so it has been disabled to prevent
destabilization of the CI system.
Change-Id: I7bd836ee14085689c8a0f0ce8e3c80d81a55eb94
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
-rw-r--r-- | tests/auto/auto.pro | 1 | ||||
-rw-r--r-- | tests/auto/gui/kernel/qclipboard/test/test.pro | 2 | ||||
-rw-r--r-- | tests/auto/gui/kernel/qkeysequence/qkeysequence.pro | 2 | ||||
-rw-r--r-- | tests/auto/gui/kernel/qwindow/qwindow.pro | 1 | ||||
-rw-r--r-- | tests/auto/gui/painting/qprinterinfo/qprinterinfo.pro | 2 | ||||
-rw-r--r-- | tests/auto/gui/qopengl/qopengl.pro | 2 | ||||
-rw-r--r-- | tests/auto/gui/text/qfontdatabase/qfontdatabase.pro | 1 | ||||
-rw-r--r-- | tests/auto/gui/text/qstatictext/qstatictext.pro | 2 | ||||
-rw-r--r-- | tests/auto/gui/text/qtextscriptengine/qtextscriptengine.pro | 2 | ||||
-rw-r--r-- | tests/auto/gui/text/text.pro | 4 |
10 files changed, 18 insertions, 1 deletions
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index 8e87e761db..1fc1ba381c 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -21,7 +21,6 @@ cross_compile: SUBDIRS -= tools # disable 'make check' on Mac OS X for the following subdirs for the time being mac { - gui.CONFIG += no_check_target network.CONFIG += no_check_target widgets.CONFIG += no_check_target } diff --git a/tests/auto/gui/kernel/qclipboard/test/test.pro b/tests/auto/gui/kernel/qclipboard/test/test.pro index 5d28e8e060..1c92fa4107 100644 --- a/tests/auto/gui/kernel/qclipboard/test/test.pro +++ b/tests/auto/gui/kernel/qclipboard/test/test.pro @@ -19,3 +19,5 @@ wince* { DEPLOYMENT += copier paster rsc reg_resource } + +mac: CONFIG += insignificant_test # QTBUG-23057 diff --git a/tests/auto/gui/kernel/qkeysequence/qkeysequence.pro b/tests/auto/gui/kernel/qkeysequence/qkeysequence.pro index 1e0baafd09..c6eb02919e 100644 --- a/tests/auto/gui/kernel/qkeysequence/qkeysequence.pro +++ b/tests/auto/gui/kernel/qkeysequence/qkeysequence.pro @@ -7,3 +7,5 @@ QT += core-private gui-private SOURCES += tst_qkeysequence.cpp RESOURCES += qkeysequence.qrc + +mac: CONFIG += insignificant_test # QTBUG-23058 diff --git a/tests/auto/gui/kernel/qwindow/qwindow.pro b/tests/auto/gui/kernel/qwindow/qwindow.pro index 9fb49e8ceb..0115d96c56 100644 --- a/tests/auto/gui/kernel/qwindow/qwindow.pro +++ b/tests/auto/gui/kernel/qwindow/qwindow.pro @@ -5,3 +5,4 @@ QT += core-private gui-private testlib SOURCES += tst_qwindow.cpp +mac: CONFIG += insignificant_test # QTBUG-23059 diff --git a/tests/auto/gui/painting/qprinterinfo/qprinterinfo.pro b/tests/auto/gui/painting/qprinterinfo/qprinterinfo.pro index f397f48bb8..b0e69dca2e 100644 --- a/tests/auto/gui/painting/qprinterinfo/qprinterinfo.pro +++ b/tests/auto/gui/painting/qprinterinfo/qprinterinfo.pro @@ -5,3 +5,5 @@ SOURCES += tst_qprinterinfo.cpp QT += printsupport network testlib DEFINES += QT_USE_USING_NAMESPACE + +mac: CONFIG += insignificant_test # QTBUG-23060 diff --git a/tests/auto/gui/qopengl/qopengl.pro b/tests/auto/gui/qopengl/qopengl.pro index 0cc574a5bc..f3c020dde2 100644 --- a/tests/auto/gui/qopengl/qopengl.pro +++ b/tests/auto/gui/qopengl/qopengl.pro @@ -7,3 +7,5 @@ TARGET = tst_qopengl QT += gui gui-private core-private testlib SOURCES += tst_qopengl.cpp + +mac: CONFIG += insignificant_test # QTBUG-23061 diff --git a/tests/auto/gui/text/qfontdatabase/qfontdatabase.pro b/tests/auto/gui/text/qfontdatabase/qfontdatabase.pro index 08442cc0ad..c853aaa100 100644 --- a/tests/auto/gui/text/qfontdatabase/qfontdatabase.pro +++ b/tests/auto/gui/text/qfontdatabase/qfontdatabase.pro @@ -10,3 +10,4 @@ wince* { DEPLOYMENT += additionalFiles } +mac: CONFIG += insignificant_test # QTBUG-23062 diff --git a/tests/auto/gui/text/qstatictext/qstatictext.pro b/tests/auto/gui/text/qstatictext/qstatictext.pro index fff006ca8c..a0955af710 100644 --- a/tests/auto/gui/text/qstatictext/qstatictext.pro +++ b/tests/auto/gui/text/qstatictext/qstatictext.pro @@ -3,3 +3,5 @@ TARGET = tst_qstatictext QT += widgets widgets-private testlib QT += core core-private gui gui-private SOURCES += tst_qstatictext.cpp + +mac: CONFIG += insignificant_test # QTBUG-23063 diff --git a/tests/auto/gui/text/qtextscriptengine/qtextscriptengine.pro b/tests/auto/gui/text/qtextscriptengine/qtextscriptengine.pro index 6dcb1b44a0..516fa67f11 100644 --- a/tests/auto/gui/text/qtextscriptengine/qtextscriptengine.pro +++ b/tests/auto/gui/text/qtextscriptengine/qtextscriptengine.pro @@ -6,3 +6,5 @@ QT += core-private gui-private testlib HEADERS += SOURCES += tst_qtextscriptengine.cpp INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/harfbuzz/src + +mac: CONFIG += insignificant_test # QTBUG-23064 diff --git a/tests/auto/gui/text/text.pro b/tests/auto/gui/text/text.pro index 5055ab61a3..c24fe7553d 100644 --- a/tests/auto/gui/text/text.pro +++ b/tests/auto/gui/text/text.pro @@ -31,3 +31,7 @@ win32:SUBDIRS -= qtextpiecetable qstatictext \ qtextlayout \ qtextpiecetable \ + +mac { + qtextlayout.CONFIG = no_check_target # QTBUG-23050 +} |