Commit 46e7092 for zlib
commit 46e7092741424ec15a55d7b2da7a515dc7933217
Author: Werner <led-control@vollstreckernet.de>
Date: Fri Jan 30 15:41:54 2026 +0100
CMake: Move the testers to the test directory.
diff --git a/contrib/puff/CMakeLists.txt b/contrib/puff/CMakeLists.txt
index 2f902c0..8e077c1 100644
--- a/contrib/puff/CMakeLists.txt
+++ b/contrib/puff/CMakeLists.txt
@@ -82,38 +82,6 @@ if(ZLIB_PUFF_BUILD_SHARED)
PROPERTIES
EXPORT_NAME PUFF
OUTPUT_NAME puff)
-
- if(ZLIB_PUFF_BUILD_TESTING AND NOT WIN32)
- enable_testing()
-
- add_executable(zlib_puff_test pufftest.c puff.h)
-
- target_link_libraries(zlib_puff_test
- PRIVATE zlib_puff_puff)
-
- add_test(NAME zlib_puff_test
- COMMAND ${CMAKE_COMMAND} -P
- ${CMAKE_CURRENT_SOURCE_DIR}/tester.cmake
- "$<TARGET_FILE:zlib_puff_test>"
- "${CMAKE_CURRENT_SOURCE_DIR}")
-
- if(GCOV_EXECUTABLE)
- add_executable(zlib_puff_test-coverage pufftest.c puff.c puff.h)
-
- target_compile_options(zlib_puff_test-coverage PRIVATE -coverage)
-
- target_link_options(zlib_puff_test-coverage PRIVATE -coverage)
-
- add_test(NAME zlib_puff_test-coverage
- COMMAND ${CMAKE_COMMAND} -P
- ${CMAKE_CURRENT_SOURCE_DIR}/tester-cov.cmake
- "$<TARGET_FILE:zlib_puff_test-coverage>"
- "${CMAKE_CURRENT_SOURCE_DIR}"
- "${CMAKE_CURRENT_BINARY_DIR}"
- ${GCOV_EXECUTABLE}
- ${llvm_option})
- endif(GCOV_EXECUTABLE)
- endif(ZLIB_PUFF_BUILD_TESTING AND NOT WIN32)
endif(ZLIB_PUFF_BUILD_SHARED)
if(ZLIB_PUFF_BUILD_STATIC)
@@ -127,39 +95,6 @@ if(ZLIB_PUFF_BUILD_STATIC)
PROPERTIES
EXPORT_NAME PUFFSTATIC
OUTPUT_NAME puff${zlib_puff_static_suffix})
-
- if(ZLIB_PUFF_BUILD_TESTING AND NOT WIN32)
- enable_testing()
-
- add_executable(zlib_puff_testStatic pufftest.c puff.h)
-
- target_link_libraries(zlib_puff_testStatic
- PRIVATE zlib_puff_puffStatic)
- add_test(NAME zlib_puff_testStatic
- COMMAND ${CMAKE_COMMAND} -P
- ${CMAKE_CURRENT_SOURCE_DIR}/tester.cmake
- "$<TARGET_FILE:zlib_puff_testStatic>"
- "${CMAKE_CURRENT_SOURCE_DIR}")
-
- if(GCOV_EXECUTABLE)
- add_executable(zlib_puff_testStatic-coverage pufftest.c puff.c puff.h)
-
- target_compile_options(zlib_puff_testStatic-coverage
- PRIVATE -coverage)
-
- target_link_options(zlib_puff_testStatic-coverage
- PRIVATE -coverage)
-
- add_test(NAME zlib_puff_testStatic-coverage
- COMMAND ${CMAKE_COMMAND} -P
- ${CMAKE_CURRENT_SOURCE_DIR}/tester-cov.cmake
- "$<TARGET_FILE:zlib_puff_testStatic-coverage>"
- "${CMAKE_CURRENT_SOURCE_DIR}"
- "${CMAKE_CURRENT_BINARY_DIR}"
- ${GCOV_EXECUTABLE}
- ${llvm_option})
- endif(GCOV_EXECUTABLE)
- endif(ZLIB_PUFF_BUILD_TESTING AND NOT WIN32)
endif(ZLIB_PUFF_BUILD_STATIC)
if(ZLIB_PUFF_INSTALL)
diff --git a/contrib/puff/test/CMakeLists.txt b/contrib/puff/test/CMakeLists.txt
index 2548d57..c7077f8 100644
--- a/contrib/puff/test/CMakeLists.txt
+++ b/contrib/puff/test/CMakeLists.txt
@@ -18,6 +18,77 @@ else(DEFINED ZLIB_BUILD_PUFF)
FIXTURES_SETUP zlib_puff_install)
endif(DEFINED ZLIB_BUILD_PUFF)
+if(ZLIB_PUFF_BUILD_SHARED AND NOT WIN32)
+ add_executable(zlib_puff_test
+ ${puff_SOURCE_DIR}/pufftest.c
+ ${puff_SOURCE_DIR}/puff.h)
+
+ target_link_libraries(zlib_puff_test
+ PRIVATE zlib_puff_puff)
+
+ add_test(NAME zlib_puff_test
+ COMMAND ${CMAKE_COMMAND} -P
+ ${CMAKE_CURRENT_SOURCE_DIR}/tester.cmake
+ "$<TARGET_FILE:zlib_puff_test>"
+ "${puff_SOURCE_DIR}")
+
+ if(GCOV_EXECUTABLE)
+ add_executable(zlib_puff_test-coverage
+ ${puff_SOURCE_DIR}/pufftest.c
+ ${puff_SOURCE_DIR}/puff.c
+ ${puff_SOURCE_DIR}/puff.h)
+
+ target_compile_options(zlib_puff_test-coverage PRIVATE -coverage)
+
+ target_link_options(zlib_puff_test-coverage PRIVATE -coverage)
+
+ add_test(NAME zlib_puff_test-coverage
+ COMMAND ${CMAKE_COMMAND} -P
+ ${CMAKE_CURRENT_SOURCE_DIR}/tester-cov.cmake
+ "$<TARGET_FILE:zlib_puff_test-coverage>"
+ "${puff_SOURCE_DIR}"
+ "$<TARGET_FILE:zlib_puff_bin-writer>"
+ ${GCOV_EXECUTABLE}
+ ${llvm_option})
+ endif(GCOV_EXECUTABLE)
+endif(ZLIB_PUFF_BUILD_SHARED AND NOT WIN32)
+
+if(ZLIB_PUFF_BUILD_STATIC AND NOT WIN32)
+ add_executable(zlib_puff_testStatic
+ ${puff_SOURCE_DIR}/pufftest.c
+ ${puff_SOURCE_DIR}/puff.h)
+
+ target_link_libraries(zlib_puff_testStatic
+ PRIVATE zlib_puff_puffStatic)
+ add_test(NAME zlib_puff_testStatic
+ COMMAND ${CMAKE_COMMAND} -P
+ ${CMAKE_CURRENT_SOURCE_DIR}/tester.cmake
+ "$<TARGET_FILE:zlib_puff_testStatic>"
+ "${puff_SOURCE_DIR}")
+
+ if(GCOV_EXECUTABLE)
+ add_executable(zlib_puff_testStatic-coverage
+ ${puff_SOURCE_DIR}/pufftest.c
+ ${puff_SOURCE_DIR}/puff.c
+ ${puff_SOURCE_DIR}/puff.h)
+
+ target_compile_options(zlib_puff_testStatic-coverage
+ PRIVATE -coverage)
+
+ target_link_options(zlib_puff_testStatic-coverage
+ PRIVATE -coverage)
+
+ add_test(NAME zlib_puff_testStatic-coverage
+ COMMAND ${CMAKE_COMMAND} -P
+ ${CMAKE_CURRENT_SOURCE_DIR}/tester-cov.cmake
+ "$<TARGET_FILE:zlib_puff_testStatic-coverage>"
+ "${puff_SOURCE_DIR}"
+ "$<TARGET_FILE:zlib_puff_bin-writer>"
+ ${GCOV_EXECUTABLE}
+ ${llvm_option})
+ endif(GCOV_EXECUTABLE)
+endif(ZLIB_PUFF_BUILD_STATIC AND NOT WIN32)
+
file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/findpackage_test)
file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_test)
file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_exclude_test)
diff --git a/contrib/puff/tester-cov.cmake b/contrib/puff/test/tester-cov.cmake
similarity index 85%
rename from contrib/puff/tester-cov.cmake
rename to contrib/puff/test/tester-cov.cmake
index 5dc9662..a91c6fd 100644
--- a/contrib/puff/tester-cov.cmake
+++ b/contrib/puff/test/tester-cov.cmake
@@ -11,12 +11,14 @@ cmake_minimum_required(VERSION 3.12...3.31)
function(puff_cov_test test_string expected_result)
execute_process(COMMAND ${CMAKE_ARGV0} -E echo_append ${test_string}
- COMMAND ${CMAKE_ARGV5}/bin-writer
+ COMMAND ${CMAKE_ARGV5}
COMMAND ${CMAKE_ARGV3}
RESULT_VARIABLE RESULT)
if(NOT RESULT EQUAL expected_result)
- message(FATAL_ERROR "${RESULT} not matching ${expected_result}")
+ message(FATAL_ERROR "Received Exit-Code: ${RESULT}\n"
+ "Expected Exit-Code: ${expected_result}\n"
+ "Test-String: ${test_string}")
endif(NOT RESULT EQUAL expected_result)
endfunction(puff_cov_test test_string expected_result)
@@ -28,7 +30,7 @@ puff_cov_test("00 00 00 00 00" "254")
puff_cov_test("00 01 00 fe ff" "2")
execute_process(COMMAND ${CMAKE_ARGV0} -E echo_append "01 01 00 fe ff 0a"
- COMMAND ${CMAKE_ARGV5}/bin-writer
+ COMMAND ${CMAKE_ARGV5}
COMMAND ${CMAKE_ARGV3})
puff_cov_test("02 7e ff ff" "246")
@@ -38,7 +40,7 @@ puff_cov_test("04 80 49 92 24 49 92 24 71 ff ff 93 11 00" "249")
puff_cov_test("04 c0 81 08 00 00 00 00 20 7f eb 0b 00 00" "246")
execute_process(COMMAND ${CMAKE_ARGV0} -E echo_append "0b 00 00"
- COMMAND ${CMAKE_ARGV5}/bin-writer
+ COMMAND ${CMAKE_ARGV5}
COMMAND ${CMAKE_ARGV3})
puff_cov_test("1a 07" "246")
diff --git a/contrib/puff/tester.cmake b/contrib/puff/test/tester.cmake
similarity index 91%
rename from contrib/puff/tester.cmake
rename to contrib/puff/test/tester.cmake
index be3b81f..3216d7c 100644
--- a/contrib/puff/tester.cmake
+++ b/contrib/puff/test/tester.cmake
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.12...3.31)
#CMAKE_ARGV0 = ${CMAKE_COMMAND}
#CMAKE_ARGV1 = -P
#CMAKE_ARGV2 = ${CMAKE_CURRENT_SOURCE_DIR}/tester.cmake
-#CMAKE_ARGV3 = "$<TARGET_FILE:puf-test>"
+#CMAKE_ARGV3 = "$<TARGET_FILE:puff-test>"
#CMAKE_ARGV4 = "${CMAKE_CURRENT_SOURCE_DIR}"
execute_process(COMMAND ${CMAKE_ARGV3}