Merge pull request #45 from linuxdeploy/fix-test-runs

Fix test runs

Author: TheAssassin

lib/linuxdeploy

@@ -1,6 +1,20 @@
+# common CMake macro for linuxdeploy, adding tests only if they are supposed to be built
+# otherwise if you try to run CTest the tests aren't build and CTest can't find them
+if(NOT COMMAND ld_add_test)
+    function(ld_add_test TARGET_NAME)
+        get_target_property(${TARGET_NAME}_EFA ${TARGET_NAME} EXCLUDE_FROM_ALL)
+        if(NOT ${${TARGET_NAME}_EXCLUDE_FROM_ALL})
+            message(STATUS "[${PROJECT_NAME}] Adding test ${TARGET_NAME}")
+            add_test(${TARGET_NAME} ${TARGET_NAME})
+        else()
+            message(STATUS "[${PROJECT_NAME}] Test ${TARGET_NAME} is excluded from ALL, not adding as test")
+        endif()
+    endfunction()
+endif()
+
 add_executable(linuxdeploy-plugin-qt-tests test_main.cpp test_deploy_qml.cpp ../src/qml.cpp)
 target_link_libraries(linuxdeploy-plugin-qt-tests linuxdeploy_core args json gtest)
 target_compile_definitions(linuxdeploy-plugin-qt-tests PRIVATE TESTS_DATA_DIR="${CMAKE_CURRENT_SOURCE_DIR}/data")
 
-add_test(linuxdeploy-plugin-qt-tests linuxdeploy-plugin-qt-tests)
+ld_add_test(linuxdeploy-plugin-qt-tests linuxdeploy-plugin-qt-tests)
 

tests/CMakeLists.txt

@@ -39,6 +39,8 @@ cmake "$REPO_ROOT" -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=RelWithDebInfo
 
 make -j$(nproc)
 
+ctest -V
+
 make install DESTDIR=AppDir
 
 strip_path=$(which strip)