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 /tests/auto/gui/text | |
parent | 4ebceaba394e54a4f43578e46839e3057e7e802d (diff) |
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>
Diffstat (limited to 'tests/auto/gui/text')
-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 |
4 files changed, 9 insertions, 0 deletions
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 +} |