From 46e7092741424ec15a55d7b2da7a515dc7933217 Mon Sep 17 00:00:00 2001 From: Werner Date: Fri, 30 Jan 2026 15:41:54 +0100 Subject: CMake: Move the testers to the test directory. --- contrib/puff/CMakeLists.txt | 65 ---------------------------------- contrib/puff/test/CMakeLists.txt | 71 ++++++++++++++++++++++++++++++++++++++ contrib/puff/test/tester-cov.cmake | 58 +++++++++++++++++++++++++++++++ contrib/puff/test/tester.cmake | 16 +++++++++ contrib/puff/tester-cov.cmake | 56 ------------------------------ contrib/puff/tester.cmake | 16 --------- 6 files changed, 145 insertions(+), 137 deletions(-) create mode 100644 contrib/puff/test/tester-cov.cmake create mode 100644 contrib/puff/test/tester.cmake delete mode 100644 contrib/puff/tester-cov.cmake delete mode 100644 contrib/puff/tester.cmake diff --git a/contrib/puff/CMakeLists.txt b/contrib/puff/CMakeLists.txt index 2f902c0d..8e077c18 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 - "$" - "${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 - "$" - "${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 - "$" - "${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 - "$" - "${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 2548d571..c7077f8a 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 + "$" + "${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 + "$" + "${puff_SOURCE_DIR}" + "$" + ${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 + "$" + "${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 + "$" + "${puff_SOURCE_DIR}" + "$" + ${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/test/tester-cov.cmake b/contrib/puff/test/tester-cov.cmake new file mode 100644 index 00000000..a91c6fd9 --- /dev/null +++ b/contrib/puff/test/tester-cov.cmake @@ -0,0 +1,58 @@ +cmake_minimum_required(VERSION 3.12...3.31) + +#CMAKE_ARGV0 = ${CMAKE_COMMAND} +#CMAKE_ARGV1 = -P +#CMAKE_ARGV2 = ${CMAKE_CURRENT_SOURCE_DIR}/tester-cov.cmake +#CMAKE_ARGV3 = "$" +#CMAKE_ARGV4 = "${CMAKE_CURRENT_SOURCE_DIR}" +#CMAKE_ARGV5 = "${CMAKE_CURRENT_BINARY_DIR}" +#CMAKE_ARGV6 = GCOV_EXECUTABLE +#CMAKE_ARGV7 = GCOV_EXECUTABLE + +function(puff_cov_test test_string expected_result) + execute_process(COMMAND ${CMAKE_ARGV0} -E echo_append ${test_string} + COMMAND ${CMAKE_ARGV5} + COMMAND ${CMAKE_ARGV3} + RESULT_VARIABLE RESULT) + + if(NOT RESULT EQUAL 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) + +execute_process(COMMAND ${CMAKE_ARGV3} -w ${CMAKE_ARGV4}/zeros.raw) + +puff_cov_test("04" "2") +puff_cov_test("00" "2") +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} + COMMAND ${CMAKE_ARGV3}) + +puff_cov_test("02 7e ff ff" "246") +puff_cov_test("02" "2") +puff_cov_test("04 80 49 92 24 49 92 24 0f b4 ff ff c3 04" "2") +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} + COMMAND ${CMAKE_ARGV3}) + +puff_cov_test("1a 07" "246") +puff_cov_test("0c c0 81 00 00 00 00 00 90 ff 6b 04" "245") + +execute_process(COMMAND ${CMAKE_ARGV3} -f ${CMAKE_ARGV4}/zeros.raw) + +puff_cov_test("fc 00 00" "253") +puff_cov_test("04 00 fe ff" "252") +puff_cov_test("04 00 24 49" "251") +puff_cov_test("04 80 49 92 24 49 92 24 0f b4 ff ff c3 84" "248") +puff_cov_test("04 00 24 e9 ff ff" "250") +puff_cov_test("04 00 24 e9 ff 6d" "247") + +execute_process(COMMAND ${CMAKE_ARGV6} ${CMAKE_ARGV7} -n puff.c.gcno) diff --git a/contrib/puff/test/tester.cmake b/contrib/puff/test/tester.cmake new file mode 100644 index 00000000..3216d7c9 --- /dev/null +++ b/contrib/puff/test/tester.cmake @@ -0,0 +1,16 @@ +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 = "$" +#CMAKE_ARGV4 = "${CMAKE_CURRENT_SOURCE_DIR}" + +execute_process(COMMAND ${CMAKE_ARGV3} + INPUT_FILE "${CMAKE_ARGV4}/zeros.raw" + RESULT_VARIABLE RESULT + COMMAND_ECHO STDERR) + +if(RESULT) + message(FATAL_ERROR "Command exitited with: ${RESULT}") +endif(RESULT) diff --git a/contrib/puff/tester-cov.cmake b/contrib/puff/tester-cov.cmake deleted file mode 100644 index 5dc9662e..00000000 --- a/contrib/puff/tester-cov.cmake +++ /dev/null @@ -1,56 +0,0 @@ -cmake_minimum_required(VERSION 3.12...3.31) - -#CMAKE_ARGV0 = ${CMAKE_COMMAND} -#CMAKE_ARGV1 = -P -#CMAKE_ARGV2 = ${CMAKE_CURRENT_SOURCE_DIR}/tester-cov.cmake -#CMAKE_ARGV3 = "$" -#CMAKE_ARGV4 = "${CMAKE_CURRENT_SOURCE_DIR}" -#CMAKE_ARGV5 = "${CMAKE_CURRENT_BINARY_DIR}" -#CMAKE_ARGV6 = GCOV_EXECUTABLE -#CMAKE_ARGV7 = GCOV_EXECUTABLE - -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_ARGV3} - RESULT_VARIABLE RESULT) - - if(NOT RESULT EQUAL expected_result) - message(FATAL_ERROR "${RESULT} not matching ${expected_result}") - endif(NOT RESULT EQUAL expected_result) -endfunction(puff_cov_test test_string expected_result) - -execute_process(COMMAND ${CMAKE_ARGV3} -w ${CMAKE_ARGV4}/zeros.raw) - -puff_cov_test("04" "2") -puff_cov_test("00" "2") -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_ARGV3}) - -puff_cov_test("02 7e ff ff" "246") -puff_cov_test("02" "2") -puff_cov_test("04 80 49 92 24 49 92 24 0f b4 ff ff c3 04" "2") -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_ARGV3}) - -puff_cov_test("1a 07" "246") -puff_cov_test("0c c0 81 00 00 00 00 00 90 ff 6b 04" "245") - -execute_process(COMMAND ${CMAKE_ARGV3} -f ${CMAKE_ARGV4}/zeros.raw) - -puff_cov_test("fc 00 00" "253") -puff_cov_test("04 00 fe ff" "252") -puff_cov_test("04 00 24 49" "251") -puff_cov_test("04 80 49 92 24 49 92 24 0f b4 ff ff c3 84" "248") -puff_cov_test("04 00 24 e9 ff ff" "250") -puff_cov_test("04 00 24 e9 ff 6d" "247") - -execute_process(COMMAND ${CMAKE_ARGV6} ${CMAKE_ARGV7} -n puff.c.gcno) diff --git a/contrib/puff/tester.cmake b/contrib/puff/tester.cmake deleted file mode 100644 index be3b81fd..00000000 --- a/contrib/puff/tester.cmake +++ /dev/null @@ -1,16 +0,0 @@ -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 = "$" -#CMAKE_ARGV4 = "${CMAKE_CURRENT_SOURCE_DIR}" - -execute_process(COMMAND ${CMAKE_ARGV3} - INPUT_FILE "${CMAKE_ARGV4}/zeros.raw" - RESULT_VARIABLE RESULT - COMMAND_ECHO STDERR) - -if(RESULT) - message(FATAL_ERROR "Command exitited with: ${RESULT}") -endif(RESULT) -- cgit v1.2.3-55-g6feb