From cce7cdd49470f565a61a9612afdad6bf3e3559ae Mon Sep 17 00:00:00 2001
From: Marcus Holland-Moritz <github@mhxnet.de>
Date: Sun, 24 Dec 2023 09:11:47 +0100
Subject: [PATCH] refactor: simplify test handling in CMakeLists.txt

---
 CMakeLists.txt                              | 60 +++++++++------------
 test/{dwarfs_badfs.cpp => badfs_test.cpp}   |  0
 test/{dwarfs_compat.cpp => compat_test.cpp} |  0
 test/{dwarfs.cpp => dwarfs_test.cpp}        |  0
 test/{entry.cpp => entry_test.cpp}          |  0
 test/{dwarfs_tools.cpp => tools_test.cpp}   |  0
 6 files changed, 24 insertions(+), 36 deletions(-)
 rename test/{dwarfs_badfs.cpp => badfs_test.cpp} (100%)
 rename test/{dwarfs_compat.cpp => compat_test.cpp} (100%)
 rename test/{dwarfs.cpp => dwarfs_test.cpp} (100%)
 rename test/{entry.cpp => entry_test.cpp} (100%)
 rename test/{dwarfs_tools.cpp => tools_test.cpp} (100%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a4be7237..1c314679 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -590,47 +590,35 @@ if(WITH_TESTS OR WITH_BENCHMARKS)
 endif()
 
 if(WITH_TESTS)
-  list(
-    APPEND
-    DWARFS_TEST_SRC
-    test/dwarfs.cpp
-    test/dwarfs_compat.cpp
-    test/dwarfs_badfs.cpp
-    test/entry.cpp
-    test/utils_test.cpp
-    test/block_merger_test.cpp
-    test/metadata_requirements_test.cpp
-    test/pcm_sample_transformer_test.cpp
-    test/pcmaudio_categorizer_test.cpp
-    test/incompressible_categorizer_test.cpp
+  list(APPEND DWARFS_TESTS
+    badfs_test
+    block_merger_test
+    compat_test
+    dwarfs_test
+    entry_test
+    incompressible_categorizer_test
+    metadata_requirements_test
+    pcm_sample_transformer_test
+    pcmaudio_categorizer_test
+    tools_test
+    utils_test
   )
 
   if(FLAC_FOUND)
-    list(APPEND DWARFS_TEST_SRC test/flac_compressor_test.cpp)
+    list(APPEND DWARFS_TESTS flac_compressor_test)
   endif()
 
-  add_executable(dwarfs_test ${DWARFS_TEST_SRC})
-
-  target_link_libraries(
-    dwarfs_test
-    test_helpers
-    gmock
-    gtest
-    gtest_main
-    "$<LINK_LIBRARY:WHOLE_ARCHIVE,dwarfs_categorizer>"
-  )
-
-  target_compile_definitions(dwarfs_test
-    PRIVATE TEST_DATA_DIR=\"${CMAKE_SOURCE_DIR}/test\")
-
-  list(APPEND TEST_TARGETS dwarfs_test)
-
-  add_executable(dwarfs_tools_test test/dwarfs_tools.cpp)
-  target_link_libraries(dwarfs_tools_test test_helpers gtest gtest_main)
-  target_compile_definitions(dwarfs_tools_test
-    PRIVATE TEST_DATA_DIR=\"${CMAKE_SOURCE_DIR}/test\"
-            TOOLS_BIN_DIR=\"${CMAKE_CURRENT_BINARY_DIR}\")
-  list(APPEND TEST_TARGETS dwarfs_tools_test)
+  foreach (test ${DWARFS_TESTS})
+    add_executable(${test} test/${test}.cpp)
+    target_link_libraries(
+      ${test} test_helpers gmock gtest gtest_main
+      "$<LINK_LIBRARY:WHOLE_ARCHIVE,dwarfs_categorizer>"
+    )
+    target_compile_definitions(${test}
+      PRIVATE TEST_DATA_DIR=\"${CMAKE_SOURCE_DIR}/test\"
+              TOOLS_BIN_DIR=\"${CMAKE_CURRENT_BINARY_DIR}\")
+    list(APPEND TEST_TARGETS ${test})
+  endforeach()
 
   foreach(tgt ${TEST_TARGETS})
     gtest_discover_tests(${tgt} DISCOVERY_TIMEOUT 120)
diff --git a/test/dwarfs_badfs.cpp b/test/badfs_test.cpp
similarity index 100%
rename from test/dwarfs_badfs.cpp
rename to test/badfs_test.cpp
diff --git a/test/dwarfs_compat.cpp b/test/compat_test.cpp
similarity index 100%
rename from test/dwarfs_compat.cpp
rename to test/compat_test.cpp
diff --git a/test/dwarfs.cpp b/test/dwarfs_test.cpp
similarity index 100%
rename from test/dwarfs.cpp
rename to test/dwarfs_test.cpp
diff --git a/test/entry.cpp b/test/entry_test.cpp
similarity index 100%
rename from test/entry.cpp
rename to test/entry_test.cpp
diff --git a/test/dwarfs_tools.cpp b/test/tools_test.cpp
similarity index 100%
rename from test/dwarfs_tools.cpp
rename to test/tools_test.cpp