From 06caff49c352aa090f17d2fec41273f8441cea1d Mon Sep 17 00:00:00 2001 From: Brandon Boese Date: Tue, 17 Oct 2023 21:05:45 -0400 Subject: [PATCH] disable-qml-and-dbus-tests --- tests/dbus/CMakeLists.txt | 1 - tests/qml/CMakeLists.txt | 11 ----------- 2 files changed, 12 deletions(-) diff --git a/tests/dbus/CMakeLists.txt b/tests/dbus/CMakeLists.txt index 1f42ad1..9be6696 100644 --- a/tests/dbus/CMakeLists.txt +++ b/tests/dbus/CMakeLists.txt @@ -8,5 +8,4 @@ target_link_libraries(dbus_test Qt5::Test gtest ) -add_test(dbus dbus_test) add_dependencies(dbus_test thumbnailer-service) diff --git a/tests/qml/CMakeLists.txt b/tests/qml/CMakeLists.txt index a165c8a..ae47bbd 100644 --- a/tests/qml/CMakeLists.txt +++ b/tests/qml/CMakeLists.txt @@ -8,14 +8,3 @@ target_link_libraries(qml_test Qt5::Test ) add_dependencies(qml_test thumbnailer-service LomiriThumbnailer-qml) - -if (${CMAKE_LIBRARY_ARCHITECTURE} STREQUAL "powerpc-linux-gnu" - OR ${CMAKE_LIBRARY_ARCHITECTURE} STREQUAL "s390x-linux-gnu") - message("Skipping qml test for ${CMAKE_LIBRARY_ARCHITECTURE}") -else() - add_test(qml ${CMAKE_SOURCE_DIR}/tools/run-xvfb.sh ./qml_test -import ${CMAKE_BINARY_DIR}/plugins) - # Clear some environment variables that can interfere with the tests - set_tests_properties(qml PROPERTIES - ENVIRONMENT "DBUS_SESSION_BUS_ADDRESS=;QT_QPA_PLATFORMTHEME=" - ) -endif() -- 2.42.0