diff options
author | Jo Asplin <jo.asplin@nokia.com> | 2011-09-12 15:17:30 +0200 |
---|---|---|
committer | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-09-13 08:25:05 +0200 |
commit | 831a160e006a5c26e2ecc1212393851f47f32dbd (patch) | |
tree | f3081b1f4e6c8f109e9bfa3373f20fa8a0fa18f6 /tests | |
parent | c6c90a0c5a7d6f04e247e919b1f51c2d4be616d0 (diff) |
Disabled tests for refactor->master integration
This change disables failing tests to increase the
likelihood that 'make check' terminates with a zero
exit status. This is done to prevent the CI system
from blocking further commits once qtbase#refactor
is merged into qtbase#master.
Failing tests are marked as insignificant (by putting
'CONFIG += insignificant_test' in the .pro file).
Note: This is a temporary measure that needs to be cleaned up
once the refactor->master integration is complete.
Ideally all disabled tests need to be enabled and passing.
All changes will be marked by the string QTBUG-21402 in a comment
for easy location.
Task-number: QTBUG-21402
Change-Id: Ic4400671671f6d9b75b106a6aa4755b20e74378d
Reviewed-on: http://codereview.qt-project.org/4678
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Diffstat (limited to 'tests')
36 files changed, 52 insertions, 17 deletions
diff --git a/tests/auto/corelib/io/qfile/test/test.pro b/tests/auto/corelib/io/qfile/test/test.pro index f4ec12f874..4117d3f690 100644 --- a/tests/auto/corelib/io/qfile/test/test.pro +++ b/tests/auto/corelib/io/qfile/test/test.pro @@ -42,3 +42,4 @@ symbian { } mac*:CONFIG+=insignificant_test +CONFIG += insignificant_test # QTBUG-21402 diff --git a/tests/auto/corelib/plugin/qpluginloader/tst/tst.pro b/tests/auto/corelib/plugin/qpluginloader/tst/tst.pro index 7ae6d89143..98de004263 100644 --- a/tests/auto/corelib/plugin/qpluginloader/tst/tst.pro +++ b/tests/auto/corelib/plugin/qpluginloader/tst/tst.pro @@ -30,3 +30,5 @@ symbian: { DEFINES += SRCDIR=\\\"$$PWD/../\\\" mac*:CONFIG+=insignificant_test + +CONFIG += insignificant_test # QTBUG-21402 diff --git a/tests/auto/corelib/tools/qsharedpointer/qsharedpointer.pro b/tests/auto/corelib/tools/qsharedpointer/qsharedpointer.pro index 014006e782..fc791f485c 100644 --- a/tests/auto/corelib/tools/qsharedpointer/qsharedpointer.pro +++ b/tests/auto/corelib/tools/qsharedpointer/qsharedpointer.pro @@ -13,3 +13,5 @@ QT = core include(externaltests.pri) CONFIG += parallel_test + +CONFIG += insignificant_test # QTBUG-21402 diff --git a/tests/auto/gestures/gestures.pro b/tests/auto/gestures/gestures.pro index 538e4f5d68..43ae4a3fa1 100644 --- a/tests/auto/gestures/gestures.pro +++ b/tests/auto/gestures/gestures.pro @@ -2,5 +2,4 @@ load(qttest_p4) QT += widgets SOURCES += tst_gestures.cpp - - +CONFIG += insignificant_test # QTBUG-21402 diff --git a/tests/auto/gui/image/qicon/qicon.pro b/tests/auto/gui/image/qicon/qicon.pro index cc87fae539..5ce4fd4c2f 100644 --- a/tests/auto/gui/image/qicon/qicon.pro +++ b/tests/auto/gui/image/qicon/qicon.pro @@ -28,3 +28,5 @@ wince* { } else { DEFINES += SRCDIR=\\\"$$PWD\\\" } + +CONFIG += insignificant_test # QTBUG-21402 diff --git a/tests/auto/gui/image/qpixmap/qpixmap.pro b/tests/auto/gui/image/qpixmap/qpixmap.pro index fe156d547c..bcd65897d2 100644 --- a/tests/auto/gui/image/qpixmap/qpixmap.pro +++ b/tests/auto/gui/image/qpixmap/qpixmap.pro @@ -31,3 +31,5 @@ wince*: { } RESOURCES += qpixmap.qrc + +CONFIG += insignificant_test # QTBUG-21402 diff --git a/tests/auto/gui/painting/qpathclipper/qpathclipper.pro b/tests/auto/gui/painting/qpathclipper/qpathclipper.pro index 2becd7dd03..85f4a58dcd 100644 --- a/tests/auto/gui/painting/qpathclipper/qpathclipper.pro +++ b/tests/auto/gui/painting/qpathclipper/qpathclipper.pro @@ -8,4 +8,4 @@ requires(contains(QT_CONFIG,private_tests)) unix:!mac:!symbian:LIBS+=-lm - +CONFIG += insignificant_test # QTBUG-21402 diff --git a/tests/auto/gui/painting/qprinter/qprinter.pro b/tests/auto/gui/painting/qprinter/qprinter.pro index cbe4ad7986..da02bdd7d6 100644 --- a/tests/auto/gui/painting/qprinter/qprinter.pro +++ b/tests/auto/gui/painting/qprinter/qprinter.pro @@ -3,3 +3,4 @@ QT += printsupport widgets SOURCES += tst_qprinter.cpp mac*:CONFIG+=insignificant_test +CONFIG += insignificant_test # QTBUG-21402 diff --git a/tests/auto/gui/painting/qprinterinfo/qprinterinfo.pro b/tests/auto/gui/painting/qprinterinfo/qprinterinfo.pro index 1bf799d6ce..8c96e2dcb7 100644 --- a/tests/auto/gui/painting/qprinterinfo/qprinterinfo.pro +++ b/tests/auto/gui/painting/qprinterinfo/qprinterinfo.pro @@ -5,3 +5,4 @@ QT += printsupport network DEFINES += QT_USE_USING_NAMESPACE +CONFIG += insignificant_test # QTBUG-21402 diff --git a/tests/auto/gui/text/qrawfont/qrawfont.pro b/tests/auto/gui/text/qrawfont/qrawfont.pro index 1f73055b00..1c08299699 100644 --- a/tests/auto/gui/text/qrawfont/qrawfont.pro +++ b/tests/auto/gui/text/qrawfont/qrawfont.pro @@ -12,3 +12,5 @@ wince*|symbian*: { } else { DEFINES += SRCDIR=\\\"$$PWD/\\\" } + +CONFIG += insignificant_test # QTBUG-21402 diff --git a/tests/auto/lancelot/lancelot.pro b/tests/auto/lancelot/lancelot.pro index 0b3901f7c4..8cb6ce0405 100644 --- a/tests/auto/lancelot/lancelot.pro +++ b/tests/auto/lancelot/lancelot.pro @@ -11,3 +11,5 @@ include($$PWD/../../baselineserver/shared/qbaselinetest.pri) !symbian:!wince*:DEFINES += SRCDIR=\\\"$$PWD\\\" linux-g++-maemo:DEFINES += USE_RUNTIME_DIR + +CONFIG += insignificant_test # QTBUG-21402 diff --git a/tests/auto/languagechange/languagechange.pro b/tests/auto/languagechange/languagechange.pro index cc91fc2d55..c51c42ebe1 100644 --- a/tests/auto/languagechange/languagechange.pro +++ b/tests/auto/languagechange/languagechange.pro @@ -2,3 +2,4 @@ load(qttest_p4) QT += widgets core-private SOURCES += tst_languagechange.cpp +CONFIG += insignificant_test # QTBUG-21402 diff --git a/tests/auto/network/bearer/qnetworksession/test/test.pro b/tests/auto/network/bearer/qnetworksession/test/test.pro index bfffe907ec..fff5770721 100644 --- a/tests/auto/network/bearer/qnetworksession/test/test.pro +++ b/tests/auto/network/bearer/qnetworksession/test/test.pro @@ -24,3 +24,5 @@ maemo6|maemo5 { PKGCONFIG += conninet } + +CONFIG += insignificant_test # QTBUG-21402 diff --git a/tests/auto/network/socket/qtcpserver/test/test.pro b/tests/auto/network/socket/qtcpserver/test/test.pro index 65e1d82613..63e2d0a981 100644 --- a/tests/auto/network/socket/qtcpserver/test/test.pro +++ b/tests/auto/network/socket/qtcpserver/test/test.pro @@ -33,5 +33,4 @@ QT = core network MOC_DIR=tmp - - +CONFIG += insignificant_test # QTBUG-21402 diff --git a/tests/auto/network/ssl/qsslsocket/qsslsocket.pro b/tests/auto/network/ssl/qsslsocket/qsslsocket.pro index 1f5c7f6aaf..f19b724ef0 100644 --- a/tests/auto/network/ssl/qsslsocket/qsslsocket.pro +++ b/tests/auto/network/ssl/qsslsocket/qsslsocket.pro @@ -46,3 +46,5 @@ wince* { } requires(contains(QT_CONFIG,private_tests)) + +CONFIG += insignificant_test # QTBUG-21402 diff --git a/tests/auto/other/maketestselftest/test/test.pro b/tests/auto/other/maketestselftest/test/test.pro index d9de51e1a3..cc0d582a54 100644 --- a/tests/auto/other/maketestselftest/test/test.pro +++ b/tests/auto/other/maketestselftest/test/test.pro @@ -16,3 +16,4 @@ win32 { } } +CONFIG += insignificant_test # QTBUG-21402 diff --git a/tests/auto/qabstractitemview/qabstractitemview.pro b/tests/auto/qabstractitemview/qabstractitemview.pro index e6c2d84b5f..cae8ca086e 100644 --- a/tests/auto/qabstractitemview/qabstractitemview.pro +++ b/tests/auto/qabstractitemview/qabstractitemview.pro @@ -2,4 +2,4 @@ load(qttest_p4) QT += widgets SOURCES += tst_qabstractitemview.cpp - +CONFIG += insignificant_test # QTBUG-21402 diff --git a/tests/auto/qabstractprintdialog/qabstractprintdialog.pro b/tests/auto/qabstractprintdialog/qabstractprintdialog.pro index faf0961b97..fb72bbf7a9 100644 --- a/tests/auto/qabstractprintdialog/qabstractprintdialog.pro +++ b/tests/auto/qabstractprintdialog/qabstractprintdialog.pro @@ -6,4 +6,4 @@ load(qttest_p4) QT += widgets printsupport SOURCES += tst_qabstractprintdialog.cpp - +CONFIG += insignificant_test # QTBUG-21402 diff --git a/tests/auto/qapplication/test/test.pro b/tests/auto/qapplication/test/test.pro index bb9e0ec406..e97982dcfa 100644 --- a/tests/auto/qapplication/test/test.pro +++ b/tests/auto/qapplication/test/test.pro @@ -33,3 +33,5 @@ win32 { } mac*:CONFIG+=insignificant_test + +CONFIG += insignificant_test # QTBUG-21402 diff --git a/tests/auto/qcombobox/qcombobox.pro b/tests/auto/qcombobox/qcombobox.pro index c3da909437..18b2826710 100644 --- a/tests/auto/qcombobox/qcombobox.pro +++ b/tests/auto/qcombobox/qcombobox.pro @@ -2,3 +2,4 @@ load(qttest_p4) QT += widgets widgets-private gui-private core-private SOURCES += tst_qcombobox.cpp +CONFIG += insignificant_test # QTBUG-21402 diff --git a/tests/auto/qcomplextext/qcomplextext.pro b/tests/auto/qcomplextext/qcomplextext.pro index 725594cdd6..b3d8308242 100644 --- a/tests/auto/qcomplextext/qcomplextext.pro +++ b/tests/auto/qcomplextext/qcomplextext.pro @@ -4,4 +4,4 @@ QT += core-private gui-private SOURCES += tst_qcomplextext.cpp INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/harfbuzz/src - +CONFIG += insignificant_test # QTBUG-21402 diff --git a/tests/auto/qdialog/qdialog.pro b/tests/auto/qdialog/qdialog.pro index 7c4defacd9..a3596b60f6 100644 --- a/tests/auto/qdialog/qdialog.pro +++ b/tests/auto/qdialog/qdialog.pro @@ -1,3 +1,5 @@ load(qttest_p4) QT += widgets SOURCES += tst_qdialog.cpp + +CONFIG += insignificant_test # QTBUG-21402 diff --git a/tests/auto/qdockwidget/qdockwidget.pro b/tests/auto/qdockwidget/qdockwidget.pro index 6409ac6efb..e59728207f 100644 --- a/tests/auto/qdockwidget/qdockwidget.pro +++ b/tests/auto/qdockwidget/qdockwidget.pro @@ -4,5 +4,4 @@ QT += core-private gui-private SOURCES += tst_qdockwidget.cpp - - +CONFIG += insignificant_test # QTBUG-21402 diff --git a/tests/auto/qdoublespinbox/qdoublespinbox.pro b/tests/auto/qdoublespinbox/qdoublespinbox.pro index 6f2b8b2d74..ff0eb2edae 100644 --- a/tests/auto/qdoublespinbox/qdoublespinbox.pro +++ b/tests/auto/qdoublespinbox/qdoublespinbox.pro @@ -2,5 +2,4 @@ load(qttest_p4) QT += widgets SOURCES += tst_qdoublespinbox.cpp - - +CONFIG += insignificant_test # QTBUG-21402 diff --git a/tests/auto/qfontcombobox/qfontcombobox.pro b/tests/auto/qfontcombobox/qfontcombobox.pro index 9e984e0d99..7faa0e36bd 100644 --- a/tests/auto/qfontcombobox/qfontcombobox.pro +++ b/tests/auto/qfontcombobox/qfontcombobox.pro @@ -2,4 +2,4 @@ load(qttest_p4) QT += widgets SOURCES += tst_qfontcombobox.cpp - +CONFIG += insignificant_test # QTBUG-21402 diff --git a/tests/auto/qinputcontext/qinputcontext.pro b/tests/auto/qinputcontext/qinputcontext.pro index 7d85446b4f..8dedc85cf0 100644 --- a/tests/auto/qinputcontext/qinputcontext.pro +++ b/tests/auto/qinputcontext/qinputcontext.pro @@ -7,3 +7,5 @@ symbian { } mac*:CONFIG+=insignificant_test + +CONFIG += insignificant_test # QTBUG-21402 diff --git a/tests/auto/qlabel/qlabel.pro b/tests/auto/qlabel/qlabel.pro index 6e9229f83a..c670a6f96b 100644 --- a/tests/auto/qlabel/qlabel.pro +++ b/tests/auto/qlabel/qlabel.pro @@ -12,3 +12,5 @@ wince*|symbian { addFiles.path = . DEPLOYMENT += addFiles } + +CONFIG += insignificant_test # QTBUG-21402 diff --git a/tests/auto/qlineedit/qlineedit.pro b/tests/auto/qlineedit/qlineedit.pro index 9a9cb2bfe1..077b7c919e 100644 --- a/tests/auto/qlineedit/qlineedit.pro +++ b/tests/auto/qlineedit/qlineedit.pro @@ -1,3 +1,5 @@ load(qttest_p4) QT += widgets SOURCES += tst_qlineedit.cpp + +CONFIG += insignificant_test # QTBUG-21402 diff --git a/tests/auto/qscrollbar/qscrollbar.pro b/tests/auto/qscrollbar/qscrollbar.pro index 75035dbcc2..262855452f 100644 --- a/tests/auto/qscrollbar/qscrollbar.pro +++ b/tests/auto/qscrollbar/qscrollbar.pro @@ -2,5 +2,5 @@ load(qttest_p4) QT += widgets SOURCES += tst_qscrollbar.cpp - mac*:CONFIG+=insignificant_test +CONFIG += insignificant_test # QTBUG-21402 diff --git a/tests/auto/qtooltip/qtooltip.pro b/tests/auto/qtooltip/qtooltip.pro index 4a78dfd3de..4da8917921 100644 --- a/tests/auto/qtooltip/qtooltip.pro +++ b/tests/auto/qtooltip/qtooltip.pro @@ -1,3 +1,5 @@ load(qttest_p4) QT += widgets SOURCES += tst_qtooltip.cpp + +CONFIG += insignificant_test # QTBUG-21402 diff --git a/tests/auto/qtreewidget/qtreewidget.pro b/tests/auto/qtreewidget/qtreewidget.pro index 5668be1da7..a9c7ce6b5a 100644 --- a/tests/auto/qtreewidget/qtreewidget.pro +++ b/tests/auto/qtreewidget/qtreewidget.pro @@ -2,4 +2,4 @@ load(qttest_p4) QT += widgets SOURCES += tst_qtreewidget.cpp - +CONFIG += insignificant_test # QTBUG-21402 diff --git a/tests/auto/testlib/selftests/test/test.pro b/tests/auto/testlib/selftests/test/test.pro index f0e0f7593c..af3370bac0 100644 --- a/tests/auto/testlib/selftests/test/test.pro +++ b/tests/auto/testlib/selftests/test/test.pro @@ -14,4 +14,4 @@ win32 { RESOURCES += ../selftests.qrc - +CONFIG += insignificant_test # QTBUG-21402 diff --git a/tests/auto/tools/moc/moc.pro b/tests/auto/tools/moc/moc.pro index 056c6b0958..f91c2f5b85 100644 --- a/tests/auto/tools/moc/moc.pro +++ b/tests/auto/tools/moc/moc.pro @@ -26,3 +26,4 @@ contains(QT_CONFIG, dbus){ QT += dbus } +CONFIG += insignificant_test # QTBUG-21402 diff --git a/tests/auto/tools/qmake/qmake.pro b/tests/auto/tools/qmake/qmake.pro index d0faa872b8..40cf5a81b6 100644 --- a/tests/auto/tools/qmake/qmake.pro +++ b/tests/auto/tools/qmake/qmake.pro @@ -5,4 +5,4 @@ QT -= gui cross_compile: DEFINES += QMAKE_CROSS_COMPILED - +CONFIG += insignificant_test # QTBUG-21402 diff --git a/tests/auto/tools/uic/uic.pro b/tests/auto/tools/uic/uic.pro index 0045015457..37c9a1e430 100644 --- a/tests/auto/tools/uic/uic.pro +++ b/tests/auto/tools/uic/uic.pro @@ -5,3 +5,5 @@ TARGET = tst_uic # This test is not run on wince (I think) DEFINES += SRCDIR=\\\"$$PWD/\\\" + +CONFIG += insignificant_test # QTBUG-21402 diff --git a/tests/auto/v8/v8.pro b/tests/auto/v8/v8.pro index feda53bf50..599aeef9c6 100644 --- a/tests/auto/v8/v8.pro +++ b/tests/auto/v8/v8.pro @@ -7,3 +7,5 @@ HEADERS += v8test.h CONFIG += parallel_test QT += v8-private + +CONFIG += insignificant_test # QTBUG-21402 |