[cmake] Rationalise names of tests vs targets

boostorg · May 22, 2019 · 4dc3836 · 4dc3836
1 parent 9cf68de
commit 4dc3836
Show file tree

Hide file tree

Showing 15 changed files with 103 additions and 50 deletions.
diff --git a/io/test/CMakeLists.txt b/io/test/CMakeLists.txt
@@ -22,6 +22,7 @@ if(GIL_ENABLE_EXT_IO_RAW)
 endif()
 
 foreach(_name ${_formats})
+  set(_test t_ext_io_${_name})
   set(_target test_ext_io_${_name})
 
   add_executable(${_target} "")
@@ -34,10 +35,11 @@ foreach(_name ${_formats})
     PRIVATE
       BOOST_GIL_IO_TEST_ALLOW_READING_IMAGES
       BOOST_GIL_IO_TEST_ALLOW_WRITING_IMAGES)
-  add_test(test.ext.io.${_name} ${_target})
+  add_test(NAME ${_test} COMMAND ${_target})
 
   unset(_name)
   unset(_target)
+  unset(_test)
 endforeach()
 
 unset(_formats)

diff --git a/numeric/test/CMakeLists.txt b/numeric/test/CMakeLists.txt
@@ -11,14 +11,19 @@ message(STATUS "Boost.GIL: Configuring Numeric extension tests")
 foreach(_name
   matrix3x2
   numeric)
-
+  set(_test t_ext_numeric_${_name})
   set(_target test_ext_numeric_${_name})
+
   add_executable(${_target} "")
   target_sources(${_target} PRIVATE ${_name}.cpp)
   target_link_libraries(${_target}
     PRIVATE
       gil_compile_options
       gil_include_directories
       gil_dependencies)
-  add_test(test.ext.${_name} ${_target})
+  add_test(NAME ${_test} COMMAND ${_target})
+
+  unset(_name)
+  unset(_target)
+  unset(_test)
 endforeach()
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -9,7 +9,8 @@ message(STATUS "Boost.GIL: Configuring core tests")
 
 foreach(_name
   promote_integral)
-  set(_target utility_${_name})
+  set(_test t_utility_${_name})
+  set(_target test_utility_${_name})
 
   add_executable(${_target} "")
   target_sources(${_target} PRIVATE ${_name}.cpp)
@@ -19,10 +20,11 @@ foreach(_name
       gil_include_directories
       gil_dependencies)
   target_compile_definitions(${_target} PRIVATE BOOST_GIL_USE_CONCEPT_CHECK)
-  add_test(test.utility.${_name} ${_target})
+  add_test(NAME ${_test} COMMAND ${_target})
 
-  unset(_target)
   unset(_name)
+  unset(_target)
+  unset(_test)
 endforeach()
 
 if(GIL_BUILD_HEADERS_TESTS)

diff --git a/test/algorithm/CMakeLists.txt b/test/algorithm/CMakeLists.txt
@@ -8,6 +8,7 @@
 foreach(_name
   for_each_pixel
   std_fill)
+  set(_test t_core_algorithm_${_name})
   set(_target test_core_algorithm_${_name})
 
   add_executable(${_target} "")
@@ -17,8 +18,9 @@ foreach(_name
       gil_compile_options
       gil_include_directories
       gil_dependencies)
-  add_test(test.core.algorithm.${_name} ${_target})
+  add_test(NAME ${_test} COMMAND ${_target})
 
   unset(_name)
   unset(_target)
+  unset(_test)
 endforeach()
diff --git a/test/channel/CMakeLists.txt b/test/channel/CMakeLists.txt
@@ -17,6 +17,7 @@ foreach(_name
   packed_channel_value
   scoped_channel_value
   test_fixture)
+  set(_test t_core_channel_${_name})
   set(_target test_core_channel_${_name})
 
   add_executable(${_target} "")
@@ -27,7 +28,7 @@ foreach(_name
       gil_include_directories
       gil_dependencies)
   target_compile_definitions(${_target} PRIVATE BOOST_GIL_USE_CONCEPT_CHECK)
-  add_test(test.core.channel.${_name} ${_target})
+  add_test(NAME ${_test} COMMAND ${_target})
 
   unset(_name)
   unset(_target)

diff --git a/test/color/CMakeLists.txt b/test/color/CMakeLists.txt
@@ -8,6 +8,7 @@
 foreach(_name
   concepts
   color_spaces_are_compatible)
+  set(_test t_core_color_${_name})
   set(_target test_core_color_${_name})
 
   add_executable(${_target} "")
@@ -18,8 +19,9 @@ foreach(_name
       gil_include_directories
       gil_dependencies)
   target_compile_definitions(${_target} PRIVATE BOOST_GIL_USE_CONCEPT_CHECK)
-  add_test(test.core.color.${_name} ${_target})
+  add_test(NAME ${_test} COMMAND ${_target})
 
   unset(_name)
   unset(_target)
+  unset(_test)
 endforeach()
diff --git a/test/color_base/CMakeLists.txt b/test/color_base/CMakeLists.txt
@@ -8,6 +8,7 @@
 foreach(_name
   concepts
   homogeneous_color_base)
+  set(_test t_core_color_base_${_name})
   set(_target test_core_color_base_${_name})
 
   add_executable(${_target} "")
@@ -18,8 +19,9 @@ foreach(_name
       gil_include_directories
       gil_dependencies)
   target_compile_definitions(${_target} PRIVATE BOOST_GIL_USE_CONCEPT_CHECK)
-  add_test(test.core.color_base.${_name} ${_target})
+  add_test(NAME ${_test} COMMAND ${_target})
 
   unset(_name)
   unset(_target)
+  unset(_test)
 endforeach()
diff --git a/test/image/CMakeLists.txt b/test/image/CMakeLists.txt
@@ -7,6 +7,7 @@
 #
 foreach(_name
   concepts)
+  set(_test t_core_image_${_name})
   set(_target test_core_image_${_name})
 
   add_executable(${_target} "")
@@ -17,8 +18,9 @@ foreach(_name
       gil_include_directories
       gil_dependencies)
   target_compile_definitions(${_target} PRIVATE BOOST_GIL_USE_CONCEPT_CHECK)
-  add_test(test.core.image.${_name} ${_target})
+  add_test(NAME ${_test} COMMAND ${_target})
 
   unset(_name)
   unset(_target)
+  unset(_test)
 endforeach()
diff --git a/test/image_view/CMakeLists.txt b/test/image_view/CMakeLists.txt
@@ -16,6 +16,7 @@ foreach(_name
   view_is_step
   view_type
   view_type_from_pixel)
+  set(_test t_core_image_view_${_name})
   set(_target test_core_image_view_${_name})
 
   add_executable(${_target} "")
@@ -26,8 +27,9 @@ foreach(_name
       gil_include_directories
       gil_dependencies)
   target_compile_definitions(${_target} PRIVATE BOOST_GIL_USE_CONCEPT_CHECK)
-  add_test(test.core.image_view.${_name} ${_target})
+  add_test(NAME ${_test} COMMAND ${_target})
 
   unset(_name)
   unset(_target)
+  unset(_test)
 endforeach()
diff --git a/test/iterator/CMakeLists.txt b/test/iterator/CMakeLists.txt
@@ -9,6 +9,7 @@ foreach(_name
   concepts
   dynamic_step
   is_planar)
+  set(_test t_core_iterator_${_name})
   set(_target test_core_iterator_${_name})
 
   add_executable(${_target} "")
@@ -19,8 +20,9 @@ foreach(_name
       gil_include_directories
       gil_dependencies)
   target_compile_definitions(${_target} PRIVATE BOOST_GIL_USE_CONCEPT_CHECK)
-  add_test(test.core.iterator.${_name} ${_target})
+  add_test(NAME ${_test} COMMAND ${_target})
 
   unset(_name)
   unset(_target)
+  unset(_test)
 endforeach()
diff --git a/test/legacy/CMakeLists.txt b/test/legacy/CMakeLists.txt
@@ -17,9 +17,9 @@ message(STATUS "Boost.GIL: Configuring core legacy tests")
 
 foreach(_name
   channel
-  image
   pixel
   pixel_iterator)
+  set(_test t_legacy_${_name})
   set(_target test_legacy_${_name})
 
   add_executable(${_target} "")
@@ -30,20 +30,35 @@ foreach(_name
       gil_include_directories
       gil_dependencies)
   target_compile_definitions(${_target} PRIVATE BOOST_GIL_USE_CONCEPT_CHECK)
-  add_test(test.legacy.${_name} ${_target})
+  add_test(NAME ${_test} COMMAND ${_target})
 
-  unset(_target)
   unset(_name)
+  unset(_target)
+  unset(_test)
 endforeach()
 
 # Add extra source files accompanying image.cpp
 foreach(_name
   image)
+  set(_test t_legacy_${_name})
   set(_target test_legacy_${_name})
+
+  add_executable(${_target} "")
   target_sources(${_target} PRIVATE
+    ${_name}.cpp
     error_if.cpp
     sample_image.cpp)
-  add_test(test.legacy.${_name}
-    ${_target}
+
+  target_link_libraries(${_target}
+    PRIVATE
+      gil_compile_options
+      gil_include_directories
+      gil_dependencies)
+  target_compile_definitions(${_target} PRIVATE BOOST_GIL_USE_CONCEPT_CHECK)
+  add_test(NAME ${_test} COMMAND ${_target}
     ${CMAKE_CURRENT_SOURCE_DIR}/gil_reference_checksums.txt)
+
+  unset(_name)
+  unset(_target)
+  unset(_test)
 endforeach()
diff --git a/test/locator/CMakeLists.txt b/test/locator/CMakeLists.txt
@@ -8,6 +8,7 @@
 foreach(_name
   concepts
   dynamic_step)
+  set(_test t_core_locator_${_name})
   set(_target test_core_locator_${_name})
 
   add_executable(${_target} "")
@@ -18,8 +19,9 @@ foreach(_name
       gil_include_directories
       gil_dependencies)
   target_compile_definitions(${_target} PRIVATE BOOST_GIL_USE_CONCEPT_CHECK)
-  add_test(test.core.locator.${_name} ${_target})
+  add_test(NAME ${_test} COMMAND ${_target})
 
   unset(_name)
   unset(_target)
+  unset(_test)
 endforeach()
diff --git a/test/pixel/CMakeLists.txt b/test/pixel/CMakeLists.txt
@@ -15,6 +15,7 @@ foreach(_name
   pixel_reference_is_mutable
   pixels_are_compatible
   test_fixture)
+  set(_test t_core_pixel_${_name})
   set(_target test_core_pixel_${_name})
 
   add_executable(${_target} "")
@@ -25,8 +26,9 @@ foreach(_name
       gil_include_directories
       gil_dependencies)
   target_compile_definitions(${_target} PRIVATE BOOST_GIL_USE_CONCEPT_CHECK)
-  add_test(test.core.pixel.${_name} ${_target})
+  add_test(NAME ${_test} COMMAND ${_target})
 
   unset(_name)
   unset(_target)
+  unset(_test)
 endforeach()
diff --git a/test/point/CMakeLists.txt b/test/point/CMakeLists.txt
@@ -8,6 +8,7 @@
 foreach(_name
   concepts
   point)
+  set(_test t_core_point_${_name})
   set(_target test_core_point_${_name})
 
   add_executable(${_target} "")
@@ -18,8 +19,9 @@ foreach(_name
       gil_include_directories
       gil_dependencies)
   target_compile_definitions(${_target} PRIVATE BOOST_GIL_USE_CONCEPT_CHECK)
-  add_test(test.core.point.${_name} ${_target})
+  add_test(NAME ${_test} COMMAND ${_target})
 
   unset(_name)
   unset(_target)
+  unset(_test)
 endforeach()
diff --git a/toolbox/test/CMakeLists.txt b/toolbox/test/CMakeLists.txt
@@ -8,32 +8,42 @@
 #
 message(STATUS "Boost.GIL: Configuring Toolbox extension tests")
 
-add_executable(test_ext_toolbox "")
-target_sources(test_ext_toolbox
-  PRIVATE
-    test.cpp
-    channel_type.cpp
-    channel_view.cpp
-    cmyka.cpp
-    get_num_bits.cpp
-    get_pixel_type.cpp
-    gray_alpha.cpp
-    gray_to_rgba.cpp
-    hsl_hsv_test.cpp
-    indexed_image_test.cpp
-    is_bit_aligned.cpp
-    is_homogeneous.cpp
-    is_similar.cpp
-    lab_test.cpp
-    pixel_bit_size.cpp
-    rgb_to_luminance.cpp
-    # TODO: Add subchroma_image.cpp after fixing run-time failure,
-    #       for details see https://github.com/boostorg/gil/pull/164
-    #subchroma_image.cpp
-    xyz_test.cpp)
-target_link_libraries(test_ext_toolbox
-  PRIVATE
-    gil_compile_options
-    gil_include_directories
-    gil_dependencies)
-add_test(test.ext.toolbox test_ext_toolbox)
+foreach(_name
+  all)
+  set(_test t_ext_toolbox_${_name})
+  set(_target test_ext_toolbox_${_name})
+
+  add_executable(${_target} "")
+  target_sources(${_target}
+    PRIVATE
+      test.cpp
+      channel_type.cpp
+      channel_view.cpp
+      cmyka.cpp
+      get_num_bits.cpp
+      get_pixel_type.cpp
+      gray_alpha.cpp
+      gray_to_rgba.cpp
+      hsl_hsv_test.cpp
+      indexed_image_test.cpp
+      is_bit_aligned.cpp
+      is_homogeneous.cpp
+      is_similar.cpp
+      lab_test.cpp
+      pixel_bit_size.cpp
+      rgb_to_luminance.cpp
+      # TODO: Add subchroma_image.cpp after fixing run-time failure,
+      #       for details see https://github.com/boostorg/gil/pull/164
+      #subchroma_image.cpp
+      xyz_test.cpp)
+  target_link_libraries(${_target}
+    PRIVATE
+      gil_compile_options
+      gil_include_directories
+      gil_dependencies)
+  add_test(NAME ${_test} COMMAND ${_target})
+
+  unset(_name)
+  unset(_target)
+  unset(_test)
+endforeach()