From d621d3949d268a376dcf2aeb38f1c7567ad0e9ed Mon Sep 17 00:00:00 2001
From: TheAssassin <theassassin@assassinate-you.net>
Date: Tue, 30 Nov 2021 00:05:15 +0100
Subject: [PATCH] Refactor and simplify tests config in CMake

---
 tests/core/CMakeLists.txt | 88 ++++++++++++++++-----------------------
 1 file changed, 36 insertions(+), 52 deletions(-)

diff --git a/tests/core/CMakeLists.txt b/tests/core/CMakeLists.txt
index 94672d3..8fbc8a3 100644
--- a/tests/core/CMakeLists.txt
+++ b/tests/core/CMakeLists.txt
@@ -1,63 +1,47 @@
-add_executable(test_appdir test_appdir.cpp)
-target_link_libraries(test_appdir PRIVATE linuxdeploy_core gtest)
-target_include_directories(test_appdir PRIVATE ${PROJECT_SOURCE_DIR}/include)
+function(ld_core_add_test_executable NAME)
+    add_executable(${ARGV})
+    target_link_libraries(${NAME} PRIVATE linuxdeploy_core gtest)
+    target_include_directories(${NAME} PRIVATE ${PROJECT_SOURCE_DIR}/include)
 
-# calculate paths to resources using CMake and hardcode them in the test binary
-target_compile_definitions(test_appdir PRIVATE
-    -DSIMPLE_LIBRARY_PATH="$<TARGET_FILE:simple_library>"
-    -DSIMPLE_EXECUTABLE_PATH="$<TARGET_FILE:simple_executable>"
-    -DSIMPLE_DESKTOP_ENTRY_PATH="${CMAKE_CURRENT_SOURCE_DIR}/../data/simple_app.desktop"
-    -DSIMPLE_ICON_PATH="${CMAKE_CURRENT_SOURCE_DIR}/../data/simple_icon.svg"
-    -DSIMPLE_FILE_PATH="${CMAKE_CURRENT_SOURCE_DIR}/../data/simple_file.txt"
-    -DREADONLY_FILE_PATH="${CMAKE_CURRENT_SOURCE_DIR}/../data/readonly-file.txt"
-)
+    # calculate paths to resources using CMake and hardcode them in the test binary
+    target_compile_definitions(${NAME} PRIVATE
+        -DSIMPLE_LIBRARY_PATH="$<TARGET_FILE:simple_library>"
+        -DSIMPLE_LIBRARY_DEBUG_PATH="$<TARGET_FILE:simple_library>.debug"
+        -DSIMPLE_LIBRARY_STRIPPED_PATH="$<TARGET_FILE:simple_library>.stripped"
 
+        -DSIMPLE_EXECUTABLE_PATH="$<TARGET_FILE:simple_executable>"
+        -DSIMPLE_EXECUTABLE_STATIC_PATH="$<TARGET_FILE:simple_executable_static>"
+
+        -DSIMPLE_DESKTOP_ENTRY_PATH="${CMAKE_CURRENT_SOURCE_DIR}/../data/simple_app.desktop"
+        -DSIMPLE_ICON_PATH="${CMAKE_CURRENT_SOURCE_DIR}/../data/simple_icon.svg"
+        -DSIMPLE_FILE_PATH="${CMAKE_CURRENT_SOURCE_DIR}/../data/simple_file.txt"
+        -DREADONLY_FILE_PATH="${CMAKE_CURRENT_SOURCE_DIR}/../data/readonly-file.txt"
+    )
+
+    # make sure library and executable are built before test_appdir
+    add_dependencies(${NAME}
+        simple_executable
+        simple_executable_static
+        simple_library
+        simple_library_stripped
+        simple_library_debug
+    )
+endfunction()
+
+ld_core_add_test_executable(test_appdir test_appdir.cpp)
 # register in CTest
 ld_add_test(test_appdir)
 
-# make sure library and executable are built before test_appdir
-add_dependencies(test_appdir simple_library simple_executable)
-
-
-add_executable(test_linuxdeploy test_linuxdeploy.cpp ../../src/core.cpp)
-target_link_libraries(test_linuxdeploy PRIVATE linuxdeploy_core args gtest gtest_main)
-target_include_directories(test_linuxdeploy PRIVATE ${PROJECT_SOURCE_DIR}/include ${PROJECT_SOURCE_DIR}/src)
-
-# calculate paths to resources using CMake and hardcode them in the test binary
-target_compile_definitions(test_linuxdeploy PRIVATE
-    -DSIMPLE_LIBRARY_PATH="$<TARGET_FILE:simple_library>"
-    -DSIMPLE_EXECUTABLE_PATH="$<TARGET_FILE:simple_executable>"
-    -DSIMPLE_DESKTOP_ENTRY_PATH="${CMAKE_CURRENT_SOURCE_DIR}/../data/simple_app.desktop"
-    -DSIMPLE_ICON_PATH="${CMAKE_CURRENT_SOURCE_DIR}/../data/simple_icon.svg"
-    -DSIMPLE_FILE_PATH="${CMAKE_CURRENT_SOURCE_DIR}/../data/simple_file.txt"
-    -DREADONLY_FILE_PATH="${CMAKE_CURRENT_SOURCE_DIR}/../data/readonly-file.txt"
-)
-
+ld_core_add_test_executable(test_linuxdeploy test_linuxdeploy.cpp ../../src/core.cpp)
+# additional dependencies
+target_link_libraries(test_linuxdeploy PRIVATE gtest_main)
+target_include_directories(test_linuxdeploy PRIVATE ${PROJECT_SOURCE_DIR}/src)
 # register in CTest
 ld_add_test(test_linuxdeploy)
-add_executable(test_elf_file test_elf_file.cpp ../../src/core.cpp)
-target_link_libraries(test_elf_file PRIVATE linuxdeploy_core args gtest gtest_main)
-target_include_directories(test_elf_file PRIVATE ${PROJECT_SOURCE_DIR}/include ${PROJECT_SOURCE_DIR}/src)
-
-# calculate paths to resources using CMake and hardcode them in the test binary
-target_compile_definitions(test_elf_file PRIVATE
-    -DSIMPLE_LIBRARY_PATH="$<TARGET_FILE:simple_library>"
-    -DSIMPLE_LIBRARY_DEBUG_PATH="$<TARGET_FILE:simple_library>.debug"
-    -DSIMPLE_LIBRARY_STRIPPED_PATH="$<TARGET_FILE:simple_library>.stripped"
-    -DSIMPLE_EXECUTABLE_PATH="$<TARGET_FILE:simple_executable>"
-    -DSIMPLE_EXECUTABLE_STATIC_PATH="$<TARGET_FILE:simple_executable_static>"
-    -DREADONLY_FILE_PATH="${CMAKE_CURRENT_SOURCE_DIR}/../data/readonly-file.txt"
-)
-
-# make sure library and executable are built before test_appdir
-add_dependencies(test_elf_file
-    simple_executable
-    simple_executable_static
-    simple_library
-    simple_library_stripped
-    simple_library_debug
-)
 
+ld_core_add_test_executable(test_elf_file test_elf_file.cpp ../../src/core.cpp)
+target_link_libraries(test_elf_file PRIVATE gtest_main)
+target_include_directories(test_elf_file PRIVATE ${PROJECT_SOURCE_DIR}/src)
 # register in CTest
 ld_add_test(test_elf_file)