Commit 6d3b776 for zlib
commit 6d3b7761550439299babe7b01fd8e742e123d138
Author: Vollstrecker <werner@vollstreckernet.de>
Date: Sat Feb 28 12:20:47 2026 +0100
CMake: Move minizip tests into test directory.
diff --git a/contrib/minizip/CMakeLists.txt b/contrib/minizip/CMakeLists.txt
index ddc1a2f..1160694 100644
--- a/contrib/minizip/CMakeLists.txt
+++ b/contrib/minizip/CMakeLists.txt
@@ -343,130 +343,5 @@ endif(MINIZIP_INSTALL)
if(MINIZIP_BUILD_TESTING)
enable_testing()
-
- if(MINIZIP_BUILD_SHARED AND
- NOT ${CMAKE_SHARED_LIBRARY_SUFFIX} STREQUAL ".dll")
- add_test(
- NAME ${ZLIB_CONTRIB_PREFIX}minizip_prepare_zip_shared
- COMMAND ${CMAKE_COMMAND} -DCREATE_SHARED=ON -P
- ${CMAKE_CURRENT_SOURCE_DIR}/test/test_helper.cm
- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/test)
- add_test(
- NAME ${ZLIB_CONTRIB_PREFIX}minizip_zipping_test_file_shared
- COMMAND ${ZLIB_CONTRIB_PREFIX}minizip test_file_shared.zip test_file_shared.txt
- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/test)
- add_test(
- NAME ${ZLIB_CONTRIB_PREFIX}minizip_prepare_unzip_shared
- COMMAND ${CMAKE_COMMAND}
- -DMOVE_SHARED=ON
- -P
- ${CMAKE_CURRENT_SOURCE_DIR}/test/test_helper.cm
- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/test)
- add_test(
- NAME ${ZLIB_CONTRIB_PREFIX}minizip_miniunzipping_test_file_shared
- COMMAND ${ZLIB_CONTRIB_PREFIX}miniunzip test_file_shared.zip
- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/test)
- add_test(
- NAME ${ZLIB_CONTRIB_PREFIX}minizip_compare_shared
- COMMAND ${CMAKE_COMMAND} -E compare_files test_file_shared.txt
- test_file_shared.orig
- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/test)
- add_test(
- NAME ${ZLIB_CONTRIB_PREFIX}minizip_clean_shared
- COMMAND ${CMAKE_COMMAND} -DDELETE_SHARED=ON -P
- ${CMAKE_CURRENT_SOURCE_DIR}/test/test_helper.cm
- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/test)
- set_tests_properties(${ZLIB_CONTRIB_PREFIX}minizip_prepare_zip_shared
- PROPERTIES
- FIXTURES_SETUP "prepare_shared;mz_shared")
- set_tests_properties(
- ${ZLIB_CONTRIB_PREFIX}minizip_zipping_test_file_shared
- PROPERTIES
- FIXTURES_REQUIRED "prepare_shared;mz_shared"
- FIXTURES_SETUP zip_shared)
- set_tests_properties(${ZLIB_CONTRIB_PREFIX}minizip_prepare_unzip_shared
- PROPERTIES
- FIXTURES_REQUIRED "zip_shared;mz_shared"
- FIXTURES_SETUP prepare_unzip_shared)
- set_tests_properties(
- ${ZLIB_CONTRIB_PREFIX}minizip_miniunzipping_test_file_shared
- PROPERTIES
- FIXTURES_REQUIRED "prepare_unzip_shared;mz_shared"
- FIXTURES_SETUP prepare_compare_shared)
- set_tests_properties(${ZLIB_CONTRIB_PREFIX}minizip_compare_shared
- PROPERTIES
- FIXTURES_REQUIRED "prepare_compare_shared;mz_shared")
- set_tests_properties(${ZLIB_CONTRIB_PREFIX}minizip_clean_shared
- PROPERTIES
- FIXTURES_CLEANUP mz_shared)
- endif(MINIZIP_BUILD_SHARED AND
- NOT ${CMAKE_SHARED_LIBRARY_SUFFIX} STREQUAL ".dll")
-
- if(MINIZIP_BUILD_STATIC)
- add_test(
- NAME ${ZLIB_CONTRIB_PREFIX}minizip_prepare_zip_static
- COMMAND ${CMAKE_COMMAND}
- -DCREATE_STATIC=ON
- -P
- ${CMAKE_CURRENT_SOURCE_DIR}/test/test_helper.cm
- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/test)
- add_test(
- NAME ${ZLIB_CONTRIB_PREFIX}minizip_zipping_test_file_static
- COMMAND ${ZLIB_CONTRIB_PREFIX}minizipstatic
- test_file_static.zip
- test_file_static.txt
- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/test)
- add_test(
- NAME ${ZLIB_CONTRIB_PREFIX}minizip_prepare_unzip_static
- COMMAND ${CMAKE_COMMAND}
- -DMOVE_STATIC=ON
- -P
- ${CMAKE_CURRENT_SOURCE_DIR}/test/test_helper.cm
- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/test)
- add_test(
- NAME
- ${ZLIB_CONTRIB_PREFIX}minizip_miniunzipping_test_file_static
- COMMAND ${ZLIB_CONTRIB_PREFIX}miniunzipstatic
- test_file_static.zip
- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/test)
- add_test(
- NAME ${ZLIB_CONTRIB_PREFIX}minizip_compare_static
- COMMAND ${CMAKE_COMMAND}
- -E compare_files
- test_file_static.txt
- test_file_static.orig
- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/test)
- add_test(
- NAME ${ZLIB_CONTRIB_PREFIX}minizip_clean_static
- COMMAND ${CMAKE_COMMAND} -DDELETE_STATIC=ON -P
- ${CMAKE_CURRENT_SOURCE_DIR}/test/test_helper.cm
- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/test)
- set_tests_properties(
- ${ZLIB_CONTRIB_PREFIX}minizip_prepare_zip_static
- PROPERTIES
- FIXTURES_SETUP "prepare_zip_static;mz_static")
- set_tests_properties(
- ${ZLIB_CONTRIB_PREFIX}minizip_zipping_test_file_static
- PROPERTIES
- FIXTURES_REQUIRED "prepare_zip_static;mz_static"
- FIXTURES_SETUP "create_zip_static")
- set_tests_properties(${ZLIB_CONTRIB_PREFIX}minizip_prepare_unzip_static
- PROPERTIES
- FIXTURES_REQUIRED "create_zip_static;mz_static"
- FIXTURES_SETUP "prepare_unzip_static")
- set_tests_properties(
- ${ZLIB_CONTRIB_PREFIX}minizip_miniunzipping_test_file_static
- PROPERTIES
- FIXTURES_REQUIRED "prepare_unzip_static;mz_static"
- FIXTURES_SETUP "prepare_compare_static")
- set_tests_properties(${ZLIB_CONTRIB_PREFIX}minizip_compare_static
- PROPERTIES
- FIXTURES_REQUIRED "prepare_compare_static;mz_static")
- #FIXTURES_SETUP "compared_static")
- set_tests_properties(${ZLIB_CONTRIB_PREFIX}minizip_clean_static
- PROPERTIES
- FIXTURES_CLEANUP mz_static)
- endif(MINIZIP_BUILD_STATIC)
-
add_subdirectory(test)
endif(MINIZIP_BUILD_TESTING)
diff --git a/contrib/minizip/test/CMakeLists.txt b/contrib/minizip/test/CMakeLists.txt
index 62a416c..765111d 100644
--- a/contrib/minizip/test/CMakeLists.txt
+++ b/contrib/minizip/test/CMakeLists.txt
@@ -197,3 +197,127 @@ set_tests_properties(
set_tests_properties(${ZLIB_CONTRIB_PREFIX}minizip_add_subdirectory_exclude_build
PROPERTIES
FIXTURES_REQUIRED mzasx_config)
+
+if(MINIZIP_BUILD_SHARED AND
+ NOT ${CMAKE_SHARED_LIBRARY_SUFFIX} STREQUAL ".dll")
+ add_test(
+ NAME ${ZLIB_CONTRIB_PREFIX}minizip_prepare_zip_shared
+ COMMAND ${CMAKE_COMMAND} -DCREATE_SHARED=ON -P
+ ${CMAKE_CURRENT_SOURCE_DIR}/test_helper.cm
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+ add_test(
+ NAME ${ZLIB_CONTRIB_PREFIX}minizip_zipping_test_file_shared
+ COMMAND ${ZLIB_CONTRIB_PREFIX}minizip test_file_shared.zip test_file_shared.txt
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+ add_test(
+ NAME ${ZLIB_CONTRIB_PREFIX}minizip_prepare_unzip_shared
+ COMMAND ${CMAKE_COMMAND}
+ -DMOVE_SHARED=ON
+ -P
+ ${CMAKE_CURRENT_SOURCE_DIR}/test_helper.cm
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+ add_test(
+ NAME ${ZLIB_CONTRIB_PREFIX}minizip_miniunzipping_test_file_shared
+ COMMAND ${ZLIB_CONTRIB_PREFIX}miniunzip test_file_shared.zip
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+ add_test(
+ NAME ${ZLIB_CONTRIB_PREFIX}minizip_compare_shared
+ COMMAND ${CMAKE_COMMAND} -E compare_files test_file_shared.txt
+ test_file_shared.orig
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+ add_test(
+ NAME ${ZLIB_CONTRIB_PREFIX}minizip_clean_shared
+ COMMAND ${CMAKE_COMMAND} -DDELETE_SHARED=ON -P
+ ${CMAKE_CURRENT_SOURCE_DIR}/test_helper.cm
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+ set_tests_properties(${ZLIB_CONTRIB_PREFIX}minizip_prepare_zip_shared
+ PROPERTIES
+ FIXTURES_SETUP "prepare_shared;mz_shared")
+ set_tests_properties(
+ ${ZLIB_CONTRIB_PREFIX}minizip_zipping_test_file_shared
+ PROPERTIES
+ FIXTURES_REQUIRED "prepare_shared;mz_shared"
+ FIXTURES_SETUP zip_shared)
+ set_tests_properties(${ZLIB_CONTRIB_PREFIX}minizip_prepare_unzip_shared
+ PROPERTIES
+ FIXTURES_REQUIRED "zip_shared;mz_shared"
+ FIXTURES_SETUP prepare_unzip_shared)
+ set_tests_properties(
+ ${ZLIB_CONTRIB_PREFIX}minizip_miniunzipping_test_file_shared
+ PROPERTIES
+ FIXTURES_REQUIRED "prepare_unzip_shared;mz_shared"
+ FIXTURES_SETUP prepare_compare_shared)
+ set_tests_properties(${ZLIB_CONTRIB_PREFIX}minizip_compare_shared
+ PROPERTIES
+ FIXTURES_REQUIRED "prepare_compare_shared;mz_shared")
+ set_tests_properties(${ZLIB_CONTRIB_PREFIX}minizip_clean_shared
+ PROPERTIES
+ FIXTURES_CLEANUP mz_shared)
+endif(MINIZIP_BUILD_SHARED AND
+ NOT ${CMAKE_SHARED_LIBRARY_SUFFIX} STREQUAL ".dll")
+
+if(MINIZIP_BUILD_STATIC)
+ add_test(
+ NAME ${ZLIB_CONTRIB_PREFIX}minizip_prepare_zip_static
+ COMMAND ${CMAKE_COMMAND}
+ -DCREATE_STATIC=ON
+ -P
+ ${CMAKE_CURRENT_SOURCE_DIR}/test_helper.cm
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+ add_test(
+ NAME ${ZLIB_CONTRIB_PREFIX}minizip_zipping_test_file_static
+ COMMAND ${ZLIB_CONTRIB_PREFIX}minizipstatic
+ test_file_static.zip
+ test_file_static.txt
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+ add_test(
+ NAME ${ZLIB_CONTRIB_PREFIX}minizip_prepare_unzip_static
+ COMMAND ${CMAKE_COMMAND}
+ -DMOVE_STATIC=ON
+ -P
+ ${CMAKE_CURRENT_SOURCE_DIR}/test_helper.cm
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+ add_test(
+ NAME
+ ${ZLIB_CONTRIB_PREFIX}minizip_miniunzipping_test_file_static
+ COMMAND ${ZLIB_CONTRIB_PREFIX}miniunzipstatic
+ test_file_static.zip
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+ add_test(
+ NAME ${ZLIB_CONTRIB_PREFIX}minizip_compare_static
+ COMMAND ${CMAKE_COMMAND}
+ -E compare_files
+ test_file_static.txt
+ test_file_static.orig
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+ add_test(
+ NAME ${ZLIB_CONTRIB_PREFIX}minizip_clean_static
+ COMMAND ${CMAKE_COMMAND} -DDELETE_STATIC=ON -P
+ ${CMAKE_CURRENT_SOURCE_DIR}/test_helper.cm
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+ set_tests_properties(
+ ${ZLIB_CONTRIB_PREFIX}minizip_prepare_zip_static
+ PROPERTIES
+ FIXTURES_SETUP "prepare_zip_static;mz_static")
+ set_tests_properties(
+ ${ZLIB_CONTRIB_PREFIX}minizip_zipping_test_file_static
+ PROPERTIES
+ FIXTURES_REQUIRED "prepare_zip_static;mz_static"
+ FIXTURES_SETUP "create_zip_static")
+ set_tests_properties(${ZLIB_CONTRIB_PREFIX}minizip_prepare_unzip_static
+ PROPERTIES
+ FIXTURES_REQUIRED "create_zip_static;mz_static"
+ FIXTURES_SETUP "prepare_unzip_static")
+ set_tests_properties(
+ ${ZLIB_CONTRIB_PREFIX}minizip_miniunzipping_test_file_static
+ PROPERTIES
+ FIXTURES_REQUIRED "prepare_unzip_static;mz_static"
+ FIXTURES_SETUP "prepare_compare_static")
+ set_tests_properties(${ZLIB_CONTRIB_PREFIX}minizip_compare_static
+ PROPERTIES
+ FIXTURES_REQUIRED "prepare_compare_static;mz_static")
+ #FIXTURES_SETUP "compared_static")
+ set_tests_properties(${ZLIB_CONTRIB_PREFIX}minizip_clean_static
+ PROPERTIES
+ FIXTURES_CLEANUP mz_static)
+endif(MINIZIP_BUILD_STATIC)