cmake: modernize cmake code in tests folder

jrfonseca · Apr 24, 2023 · b4a10b3 · b4a10b3
1 parent fc05121
commit b4a10b3
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 3 deletions.
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -1,6 +1,5 @@
 force_debug ()
 
-
 #
 # test_mgwhelp
 #
@@ -16,6 +15,7 @@ add_test (
     NAME test_mgwhelp
     COMMAND test_mgwhelp
 )
+set_tests_properties(test_mgwhelp PROPERTIES FIXTURES_REQUIRED test_fixture)
 
 #
 # test_mgwhelp_split
@@ -47,6 +47,7 @@ add_test (
     NAME test_mgwhelp_split
     COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test_mgwhelp_split.exe
 )
+set_tests_properties(test_mgwhelp_split PROPERTIES FIXTURES_REQUIRED test_fixture)
 
 
 #
@@ -82,7 +83,7 @@ add_test (
     NAME test_mgwhelp_split_subdir
     COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test_mgwhelp_split_subdir.exe
 )
-
+set_tests_properties(test_mgwhelp_split_subdir PROPERTIES FIXTURES_REQUIRED test_fixture)
 
 #
 # test_mgwhelp_stripped
@@ -105,13 +106,13 @@ add_test (
     NAME test_mgwhelp_stripped
     COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test_mgwhelp_stripped.exe
 )
+set_tests_properties(test_mgwhelp_stripped PROPERTIES FIXTURES_REQUIRED test_fixture)
 
 
 #
 # test_mgwhelp_zdebug
 #
 
-option (ENABLE_ZDEBUG_TEST "Enable compressed debug sections test." OFF)
 add_custom_command (
     OUTPUT ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test_mgwhelp_zdebug.debug
     COMMAND ${CMAKE_OBJCOPY} --only-keep-debug --compress-debug-sections $<TARGET_FILE:test_mgwhelp> ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test_mgwhelp_zdebug.debug
@@ -181,6 +182,7 @@ endif ()
 if (OBJCOPY_VERSION STREQUAL "llvm-objcopy")
     set_target_properties (test_mgwhelp_zdebug PROPERTIES EXCLUDE_FROM_ALL ON)
 else ()
+    set_tests_properties(test_mgwhelp_zdebug PROPERTIES FIXTURES_REQUIRED test_fixture)
 endif ()
 if (OBJCOPY_VERSION STREQUAL "llvm-objcopy" OR OBJCOPY_VERSION VERSION_LESS "2.34")
     set_tests_properties (test_mgwhelp_zdebug PROPERTIES DISABLED ON)
@@ -203,6 +205,7 @@ add_test (
     COMMAND test_exchndl_static_unicode
     WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
 )
+set_tests_properties(test_exchndl_static_unicode PROPERTIES FIXTURES_REQUIRED test_fixture)
 
 
 #
@@ -221,6 +224,7 @@ add_test (
     COMMAND test_exchndl_static_ansi
     WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
 )
+set_tests_properties(test_exchndl_static_ansi PROPERTIES FIXTURES_REQUIRED test_fixture)
 
 
 #
@@ -239,6 +243,7 @@ add_test (
     COMMAND test_exchndl_dynamic_unicode
     WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
 )
+set_tests_properties(test_exchndl_dynamic_unicode PROPERTIES FIXTURES_REQUIRED test_fixture)
 
 
 #
@@ -257,6 +262,7 @@ add_test (
     COMMAND test_exchndl_dynamic_ansi
     WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
 )
+set_tests_properties(test_exchndl_dynamic_ansi PROPERTIES FIXTURES_REQUIRED test_fixture)
 
 
 #
@@ -271,3 +277,13 @@ add_test (
     COMMAND test_addr2line
     WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
 )
+set_tests_properties(test_addr2line PROPERTIES FIXTURES_REQUIRED test_fixture)
+
+add_test(test_build
+    "${CMAKE_COMMAND}"
+    --build "${CMAKE_BINARY_DIR}"
+    --config "$<CONFIG>"
+    --target all
+)
+
+set_tests_properties(test_build PROPERTIES FIXTURES_SETUP test_fixture)
diff --git a/tests/apps/CMakeLists.txt b/tests/apps/CMakeLists.txt
@@ -37,6 +37,12 @@ if (MINGW)
     set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fno-omit-frame-pointer")
     set (CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -fno-omit-frame-pointer")
     set (CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -fno-omit-frame-pointer")
+
+    add_link_options(
+        -static
+        -static-libgcc
+        -static-libstdc++
+    )
 endif ()
 
 # https://github.com/jrfonseca/drmingw/issues/42