tests: Simplify: Remove 5.15/6.0+ check for OMEMO

qxmpp-project · Feb 3, 2024 · ee5ec34 · ee5ec34
1 parent b6b095e
commit ee5ec34
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 18 deletions.
diff --git a/tests/travis/build-and-test b/tests/travis/build-and-test
@@ -13,18 +13,12 @@ CMAKE_ARGS="-DBUILD_TESTS:BOOL=True"
 case "$CONFIG" in
 full*)
     CMAKE_ARGS="-DBUILD_DOCUMENTATION:BOOL=True -DBUILD_EXAMPLES:BOOL=True -DWITH_GSTREAMER:BOOL=True"
-    case "$QT_VERSION" in
-    5.15* | 6*)
-        if [ $HOST_SYSTEM = "Linux" ]; then
-            # Enable OMEMO
-            CMAKE_ARGS="$CMAKE_ARGS -DBUILD_OMEMO=ON"
-        fi
-        ;;
-    esac
-    ;;
-esac
 
-case "$CONFIG" in
+    # Enable OMEMO
+    if [ $HOST_SYSTEM = "Linux" ]; then
+        CMAKE_ARGS="$CMAKE_ARGS -DBUILD_OMEMO=ON"
+    fi
+    ;;
 *debug*)
     CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_BUILD_TYPE:STRING=Debug -DBUILD_INTERNAL_TESTS:BOOL=True"
     ;;

diff --git a/tests/travis/install-build-depends-debian b/tests/travis/install-build-depends-debian
@@ -34,13 +34,8 @@ full*)
         libprotobuf-c-dev \
         libssl-dev
 
-    # Enable OMEMO for Qt > 5.15 (including Qt 6)
     # Build and install qca and libomemo-c
-    case "$QT_VERSION" in
-    5.15* | 6)
-        install_cmake libomemo-c https://github.com/dino/libomemo-c "-DBUILD_SHARED_LIBS=ON"
-        install_cmake qca https://invent.kde.org/libraries/qca "-DBUILD_TESTS=OFF -DBUILD_TOOLS=OFF -DBUILD_WITH_QT6=OFF"
-        ;;
-    esac
+    install_cmake libomemo-c https://github.com/dino/libomemo-c "-DBUILD_SHARED_LIBS=ON"
+    install_cmake qca https://invent.kde.org/libraries/qca "-DBUILD_TESTS=OFF -DBUILD_TOOLS=OFF -DBUILD_WITH_QT6=OFF"
     ;;
 esac