telepathy-qt: CMake: Cleanup tests conditions

[Alexandr Akulich]

Module: telepathy-qt
Branch: master
Commit: af153e9016491d3aead313adbfb8418d134ddade
URL:    http://cgit.freedesktop.org/telepathy/telepathy-qt/commit/?id=af153e9016491d3aead313adbfb8418d134ddade

Author: Alexander Akulich <akulichalexander at gmail.com>
Date:   Thu Nov  7 02:20:06 2019 +0300

CMake: Cleanup tests conditions

---

 tests/dbus/CMakeLists.txt | 31 +++++--------------------------
 1 file changed, 5 insertions(+), 26 deletions(-)

diff --git a/tests/dbus/CMakeLists.txt b/tests/dbus/CMakeLists.txt
index 8aef0f75..2365e969 100644
--- a/tests/dbus/CMakeLists.txt
+++ b/tests/dbus/CMakeLists.txt
@@ -14,20 +14,6 @@ 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 ()
-    else ()
-        # Currently none - this variable is here in case some issues arise
-        SET(ENABLE_TESTS_WITH_ISSUES_IN_QT_5 FALSE)
-        SET(ENABLE_TESTS_WITH_RACES_IN_QT_4_6 TRUE)
-    endif ()
-
     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)
@@ -71,20 +57,13 @@ if(ENABLE_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)
 
-    if (ENABLE_TESTS_WITH_RACES_IN_QT_4_6)
-        tpqt_add_dbus_unit_test(TextChannel text-chan tp-glib-tests tp-qt-tests-glib-helpers)
-        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()
-    endif ()
-
-    if(NOT (${QT_VERSION_MAJOR} EQUAL 4 AND ${QT_VERSION_MINOR} LESS 8))
-        message(STATUS "Enabling Qt 4.8+ tests")
-        tpqt_add_dbus_unit_test(DBusTubeChannel dbus-tube-chan tp-glib-tests tp-qt-tests-glib-helpers)
+    tpqt_add_dbus_unit_test(TextChannel text-chan tp-glib-tests tp-qt-tests-glib-helpers)
+    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()
 
-
+    tpqt_add_dbus_unit_test(DBusTubeChannel dbus-tube-chan tp-glib-tests tp-qt-tests-glib-helpers)
 endif()
 
 tpqt_add_dbus_unit_test(CmProtocol cm-protocol)