]> cloud.milkyroute.net Git - dolphin.git/commitdiff
Make ruby, and Gem:test-unit, optional
authorAdriaan de Groot <groot@kde.org>
Thu, 28 May 2020 21:39:52 +0000 (23:39 +0200)
committerAdriaan de Groot <groot@kde.org>
Thu, 28 May 2020 21:39:52 +0000 (23:39 +0200)
While this reduces test-coverage in cases where the user doesn't have
Ruby or the testing gem installed, it at least allows us to get
through configure and build without disabling **all** testing.

src/tests/CMakeLists.txt

index 8d4498675881910ceeec68bcb137042b5b16b4a3..d1c25a2b8ef067b47939f2e98f063f514da111c3 100644 (file)
@@ -3,11 +3,7 @@ set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
 find_package(Qt5Test CONFIG REQUIRED)
 include(ECMAddTests)
 
-include(FindGem)
-
-find_gem(test-unit REQUIRED)
-set_package_properties(Gem:test-unit PROPERTIES
-    DESCRIPTION "Ruby gem 'test-unit' required for testing of servicemenu helpers.")
+include(FindGem)  # For servicemenutest, see bottom of this file
 
 # KItemSetTest
 ecm_add_test(kitemsettest.cpp LINK_LIBRARIES dolphinprivate Qt5::Test)
@@ -84,5 +80,11 @@ if (KF5_VERSION VERSION_GREATER_EQUAL 5.63.0)
     LINK_LIBRARIES dolphinprivate dolphinstatic Qt5::Test)
 endif()
 
-add_test(NAME servicemenutest
- COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/../settings/services/test/test_run.rb)
+find_gem(test-unit)
+set_package_properties(Gem:test-unit PROPERTIES
+    TYPE RECOMMENDED
+    DESCRIPTION "Ruby gem 'test-unit' required for testing of servicemenu helpers.")
+if (Gem:test-unit_FOUND)
+  add_test(NAME servicemenutest
+  COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/../settings/services/test/test_run.rb)
+endif()