summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndre Moreira Magalhaes (andrunko) <andre.magalhaes@collabora.co.uk>2011-12-20 19:41:59 (GMT)
committerAndre Moreira Magalhaes (andrunko) <andre.magalhaes@collabora.co.uk>2011-12-20 20:13:14 (GMT)
commit651948b25e2c7919ef6cf87266472e3cf8c000e7 (patch)
tree9de77053ffdb1645b8a949b64935dbb1e181f30d
parent1e8084f879afa2735f3912976ddd0d7b31002b0c (diff)
downloadtelepathy-qt4-651948b25e2c7919ef6cf87266472e3cf8c000e7.tar.gz
telepathy-qt4-651948b25e2c7919ef6cf87266472e3cf8c000e7.tar.xz
Disable tests failing in Qt 4.6.
-rw-r--r--tests/dbus/CMakeLists.txt43
1 files changed, 27 insertions, 16 deletions
diff --git a/tests/dbus/CMakeLists.txt b/tests/dbus/CMakeLists.txt
index 5dd5b97..7c4b2ea 100644
--- a/tests/dbus/CMakeLists.txt
+++ b/tests/dbus/CMakeLists.txt
@@ -14,6 +14,23 @@ if(ENABLE_TP_GLIB_TESTS)
add_definitions(-DQT_NO_KEYWORDS)
+ if (${QT_VERSION_MAJOR} EQUAL 4)
+ if (NOT ${QT_VERSION_MINOR} EQUAL 6)
+ # >= qt 4.7
+ # FIXME - Re-enable racy tests once https://bugs.freedesktop.org/show_bug.cgi?id=43356 is
+ # fixed
+ SET(ENABLE_TESTS_WITH_RACES_IN_QT_4_6 TRUE)
+ SET(ENABLE_TESTS_WITH_ISSUES_IN_QT_5 TRUE)
+ endif (NOT ${QT_VERSION_MINOR} EQUAL 6)
+ else (${QT_VERSION_MAJOR} EQUAL 4)
+ # qt 5
+ # FIXME - Re-enable tube tests once Qt5 QHostAddress bugs are fixed
+ # See https://bugreports.qt.nokia.com/browse/QTBUG-22898 and
+ # https://bugreports.qt.nokia.com/browse/QTBUG-22899
+ SET(ENABLE_TESTS_WITH_ISSUES_IN_QT_5 FALSE)
+ SET(ENABLE_TESTS_WITH_RACES_IN_QT_4_6 TRUE)
+ endif (${QT_VERSION_MAJOR} EQUAL 4)
+
if(HAVE_TEST_PYTHON)
tpqt_add_dbus_unit_test(AccountBasics account-basics tp-glib-tests tp-qt-tests-glib-helpers)
tpqt_add_dbus_unit_test(AccountSet account-set tp-glib-tests tp-qt-tests-glib-helpers)
@@ -25,7 +42,6 @@ if(ENABLE_TP_GLIB_TESTS)
tpqt_add_dbus_unit_test(AccountConnectionFactory account-connection-factory tp-glib-tests tp-qt-tests-glib-helpers)
tpqt_add_dbus_unit_test(ChannelBasics chan-basics tp-glib-tests tp-qt-tests-glib-helpers)
tpqt_add_dbus_unit_test(ChannelConference chan-conference tp-glib-tests tp-qt-tests-glib-helpers)
- tpqt_add_dbus_unit_test(ChannelGroup chan-group tp-glib-tests tp-qt-tests-glib-helpers)
tpqt_add_dbus_unit_test(ConnectionManagerBasics cm-basics tp-glib-tests)
tpqt_add_dbus_unit_test(ConnectionAddressing conn-addressing tp-glib-tests tp-qt-tests-glib-helpers)
tpqt_add_dbus_unit_test(ConnectionBasics conn-basics tp-glib-tests)
@@ -51,23 +67,18 @@ if(ENABLE_TP_GLIB_TESTS)
tpqt_add_dbus_unit_test(SimpleObserver simple-observer tp-glib-tests)
tpqt_add_dbus_unit_test(StatefulProxy stateful-proxy tp-glib-tests)
tpqt_add_dbus_unit_test(StreamedMediaChannel streamed-media-chan tp-glib-tests tp-qt-tests-glib-helpers)
- # FIXME - Re-enable tube tests once Qt5 QHostAddress bugs are fixed
- # See https://bugreports.qt.nokia.com/browse/QTBUG-22898 and
- # https://bugreports.qt.nokia.com/browse/QTBUG-22899
-if(${QT_VERSION_MAJOR} EQUAL 4)
- tpqt_add_dbus_unit_test(StreamTubeHandlers stream-tube-handlers tp-glib-tests tp-qt-tests-glib-helpers)
-endif(${QT_VERSION_MAJOR} EQUAL 4)
- tpqt_add_dbus_unit_test(TextChannel text-chan tp-glib-tests tp-qt-tests-glib-helpers)
+ if (ENABLE_TESTS_WITH_RACES_IN_QT_4_6)
+ tpqt_add_dbus_unit_test(ChannelGroup chan-group tp-glib-tests tp-qt-tests-glib-helpers)
+ tpqt_add_dbus_unit_test(TextChannel text-chan tp-glib-tests tp-qt-tests-glib-helpers)
+ if (ENABLE_TESTS_WITH_ISSUES_IN_QT_5)
+ tpqt_add_dbus_unit_test(StreamTubeHandlers stream-tube-handlers tp-glib-tests tp-qt-tests-glib-helpers)
+ if(ENABLE_TP_GLIB_GIO_TESTS)
+ tpqt_add_dbus_unit_test(StreamTubeChannel stream-tube-chan tp-glib-tests tp-qt-tests-glib-helpers)
+ endif(ENABLE_TP_GLIB_GIO_TESTS)
+ endif (ENABLE_TESTS_WITH_ISSUES_IN_QT_5)
+ endif (ENABLE_TESTS_WITH_RACES_IN_QT_4_6)
- if(ENABLE_TP_GLIB_GIO_TESTS)
- # FIXME - Re-enable tube tests once Qt5 QHostAddress bugs are fixed
- # See https://bugreports.qt.nokia.com/browse/QTBUG-22898 and
- # https://bugreports.qt.nokia.com/browse/QTBUG-22899
- if(${QT_VERSION_MAJOR} EQUAL 4)
- tpqt_add_dbus_unit_test(StreamTubeChannel stream-tube-chan tp-glib-tests tp-qt-tests-glib-helpers)
- endif(${QT_VERSION_MAJOR} EQUAL 4)
- endif(ENABLE_TP_GLIB_GIO_TESTS)
endif(ENABLE_TP_GLIB_TESTS)
tpqt_add_dbus_unit_test(CmProtocol cm-protocol)