Commit bcf22ee for zlib
commit bcf22eeb0f5e4ae9b9a3888b1fe5fa17d57bf9f3
Author: Vollstrecker <werner@vollstreckernet.de>
Date: Sat Feb 28 11:18:28 2026 +0100
CMake: Move Ada tests to test directory.
diff --git a/contrib/ada/CMakeLists.txt b/contrib/ada/CMakeLists.txt
index a49ca7e..4781064 100644
--- a/contrib/ada/CMakeLists.txt
+++ b/contrib/ada/CMakeLists.txt
@@ -37,21 +37,6 @@ if(NOT DEFINED ZLIB_BUILD_ADA)
find_package(ZLIB REQUIRED COMPONENTS ${REQUIRED_COMPONENTS} CONFIG)
endif(NOT DEFINED ZLIB_BUILD_ADA)
-function(ZLIB_ADA_findTestEnv testName)
- set(testEnv "PATH=")
-
- if(MSVC OR MINGW)
- set(separator "\\\;")
- else()
- set(separator ":")
- endif()
-
- string(APPEND testEnv "$<TARGET_FILE_DIR:ZLIB::ZLIB>${separator}")
- string(APPEND testEnv "$ENV{PATH}")
-
- set_tests_properties(${testName} PROPERTIES ENVIRONMENT "${testEnv}")
-endfunction(ZLIB_ADA_findTestEnv testName)
-
if(ZLIB_ADA_BUILD_SHARED)
ada_add_library(zlib_ada_Ada SHARED
zlib-thin.adb
@@ -71,87 +56,6 @@ if(ZLIB_ADA_BUILD_SHARED)
zlib_ada_Ada)
ada_find_ali(zlib_ada_streams)
-
- if(ZLIB_ADA_BUILD_TESTING)
- enable_testing()
- ada_add_executable(zlib_ada_test test.adb)
-
- target_link_libraries(zlib_ada_test
- PRIVATE
- zlib_ada_Ada
- zlib_ada_streams)
-
- ada_find_ali(zlib_ada_test)
-
- add_test(NAME zlib_ada_test COMMAND zlib_ada_test)
- set_tests_properties(zlib_ada_test
- PROPERTIES
- FIXTURES_REQUIRED zlib_ada_cleanup
- RESOURCE_LOCK ada_test_files)
-
- if(MSVC
- OR MSYS
- OR MINGW
- OR CYGWIN)
- zlib_ada_findtestenv(zlib_ada_ada-test)
- endif(
- MSVC
- OR MSYS
- OR MINGW
- OR CYGWIN)
-
- ada_add_executable(zlib_ada_buffer_demo buffer_demo.adb)
-
- target_link_libraries(zlib_ada_buffer_demo
- PRIVATE
- zlib_ada_Ada)
-
- ada_find_ali(zlib_ada_buffer_demo)
-
- add_test(NAME zlib_ada_buffer-demo COMMAND zlib_ada_buffer_demo)
-
- if(MSVC
- OR MSYS
- OR MINGW
- OR CYGWIN)
- zlib_ada_findtestenv(zlib_ada_buffer-demo)
- endif(
- MSVC
- OR MSYS
- OR MINGW
- OR CYGWIN)
-
- ada_add_executable(zlib_ada_mtest mtest.adb)
-
- target_link_libraries(zlib_ada_mtest
- PRIVATE
- zlib_ada_Ada)
-
- ada_find_ali(zlib_ada_mtest)
-
- #Not adding test as this is an endless-loop
-
- ada_add_executable(zlib_ada_read read.adb)
-
- target_link_libraries(zlib_ada_read
- PRIVATE
- zlib_ada_Ada)
-
- ada_find_ali(zlib_ada_read)
-
- add_test(NAME zlib_ada_read COMMAND zlib_ada_read)
-
- if(MSVC
- OR MSYS
- OR MINGW
- OR CYGWIN)
- zlib_ada_findtestenv(zlib_ada_read)
- endif(
- MSVC
- OR MSYS
- OR MINGW
- OR CYGWIN)
- endif(ZLIB_ADA_BUILD_TESTING)
endif(ZLIB_ADA_BUILD_SHARED)
if(ZLIB_ADA_BUILD_STATIC)
@@ -173,64 +77,9 @@ if(ZLIB_ADA_BUILD_STATIC)
zlib_ada_AdaStatic)
ada_find_ali(zlib_ada_streamsStatic)
-
- if(ZLIB_ADA_BUILD_TESTING)
- enable_testing()
- ada_add_executable(zlib_ada_testStatic test.adb)
-
- target_link_libraries(zlib_ada_testStatic
- PRIVATE
- zlib_ada_AdaStatic
- zlib_ada_streamsStatic)
-
- ada_find_ali(zlib_ada_testStatic)
-
- add_test(NAME zlib_ada_testStatic COMMAND zlib_ada_testStatic)
- set_tests_properties(zlib_ada_testStatic
- PROPERTIES
- FIXTURES_REQUIRED zlib_ada_cleanup
- RESOURCE_LOCK ada_test_files)
-
- ada_add_executable(zlib_ada_buffer-demoStatic buffer_demo.adb)
-
- target_link_libraries(zlib_ada_buffer-demoStatic
- PRIVATE
- zlib_ada_AdaStatic)
-
- ada_find_ali(zlib_ada_buffer-demoStatic)
-
- add_test(NAME zlib_ada_buffer-demoStatic
- COMMAND zlib_ada_buffer-demoStatic)
-
- ada_add_executable(zlib_ada_mtestStatic mtest.adb)
-
- target_link_libraries(zlib_ada_mtestStatic
- PRIVATE
- zlib_ada_AdaStatic)
-
- ada_find_ali(zlib_ada_mtestStatic)
-
- # Not adding test as this is an endless-loop
-
- ada_add_executable(zlib_ada_readStatic read.adb)
-
- target_link_libraries(zlib_ada_readStatic
- PRIVATE
- zlib_ada_AdaStatic)
-
- ada_find_ali(zlib_ada_readStatic)
-
- add_test(NAME zlib_ada_readStatic COMMAND zlib_ada_readStatic)
- endif(ZLIB_ADA_BUILD_TESTING)
endif(ZLIB_ADA_BUILD_STATIC)
if(ZLIB_ADA_BUILD_TESTING)
- add_test(NAME zlib_ada_cleanup
- COMMAND ${CMAKE_COMMAND} -E rm
- ${CMAKE_CURRENT_BINARY_DIR}/testzlib.in
- ${CMAKE_CURRENT_BINARY_DIR}/testzlib.out
- ${CMAKE_CURRENT_BINARY_DIR}/testzlib.zlb)
- set_tests_properties(zlib_ada_cleanup
- PROPERTIES
- FIXTURES_CLEANUP zlib_ada_cleanup)
+ enable_testing()
+ add_subdirectory(test)
endif(ZLIB_ADA_BUILD_TESTING)
diff --git a/contrib/ada/test/CMakeLists.txt b/contrib/ada/test/CMakeLists.txt
new file mode 100644
index 0000000..9371921
--- /dev/null
+++ b/contrib/ada/test/CMakeLists.txt
@@ -0,0 +1,153 @@
+function(ZLIB_ADA_findTestEnv testName)
+ set(testEnv "PATH=")
+
+ if(MSVC OR MINGW)
+ set(separator "\\\;")
+ else()
+ set(separator ":")
+ endif()
+
+ string(APPEND testEnv "$<TARGET_FILE_DIR:ZLIB::ZLIB>${separator}")
+ string(APPEND testEnv "$ENV{PATH}")
+
+ set_tests_properties(${testName} PROPERTIES ENVIRONMENT "${testEnv}")
+endfunction(ZLIB_ADA_findTestEnv testName)
+
+if(ZLIB_ADA_BUILD_SHARED)
+ ada_add_executable(zlib_ada_test ${zlibAda_SOURCE_DIR}/test.adb)
+
+ target_link_libraries(zlib_ada_test
+ PRIVATE
+ zlib_ada_Ada
+ zlib_ada_streams)
+
+ ada_find_ali(zlib_ada_test)
+
+ add_test(NAME zlib_ada_test COMMAND zlib_ada_test)
+ set_tests_properties(zlib_ada_test
+ PROPERTIES
+ FIXTURES_REQUIRED zlib_ada_cleanup
+ RESOURCE_LOCK ada_test_files)
+
+ if(MSVC
+ OR MSYS
+ OR MINGW
+ OR CYGWIN)
+ zlib_ada_findtestenv(zlib_ada_ada-test)
+ endif(
+ MSVC
+ OR MSYS
+ OR MINGW
+ OR CYGWIN)
+
+ ada_add_executable(zlib_ada_buffer_demo
+ ${zlibAda_SOURCE_DIR}/buffer_demo.adb)
+
+ target_link_libraries(zlib_ada_buffer_demo
+ PRIVATE
+ zlib_ada_Ada)
+
+ ada_find_ali(zlib_ada_buffer_demo)
+
+ add_test(NAME zlib_ada_buffer-demo COMMAND zlib_ada_buffer_demo)
+
+ if(MSVC
+ OR MSYS
+ OR MINGW
+ OR CYGWIN)
+ zlib_ada_findtestenv(zlib_ada_buffer-demo)
+ endif(
+ MSVC
+ OR MSYS
+ OR MINGW
+ OR CYGWIN)
+
+ ada_add_executable(zlib_ada_mtest ${zlibAda_SOURCE_DIR}/mtest.adb)
+
+ target_link_libraries(zlib_ada_mtest
+ PRIVATE
+ zlib_ada_Ada)
+
+ ada_find_ali(zlib_ada_mtest)
+
+ #Not adding test as this is an endless-loop
+
+ ada_add_executable(zlib_ada_read ${zlibAda_SOURCE_DIR}/read.adb)
+
+ target_link_libraries(zlib_ada_read
+ PRIVATE
+ zlib_ada_Ada)
+
+ ada_find_ali(zlib_ada_read)
+
+ add_test(NAME zlib_ada_read COMMAND zlib_ada_read)
+
+ if(MSVC
+ OR MSYS
+ OR MINGW
+ OR CYGWIN)
+ zlib_ada_findtestenv(zlib_ada_read)
+ endif(
+ MSVC
+ OR MSYS
+ OR MINGW
+ OR CYGWIN)
+endif(ZLIB_ADA_BUILD_SHARED)
+
+if(ZLIB_ADA_BUILD_STATIC)
+ ada_add_executable(zlib_ada_testStatic ${zlibAda_SOURCE_DIR}/test.adb)
+
+ target_link_libraries(zlib_ada_testStatic
+ PRIVATE
+ zlib_ada_AdaStatic
+ zlib_ada_streamsStatic)
+
+ ada_find_ali(zlib_ada_testStatic)
+
+ add_test(NAME zlib_ada_testStatic COMMAND zlib_ada_testStatic)
+ set_tests_properties(zlib_ada_testStatic
+ PROPERTIES
+ FIXTURES_REQUIRED zlib_ada_cleanup
+ RESOURCE_LOCK ada_test_files)
+
+ ada_add_executable(zlib_ada_buffer-demoStatic
+ ${zlibAda_SOURCE_DIR}/buffer_demo.adb)
+
+ target_link_libraries(zlib_ada_buffer-demoStatic
+ PRIVATE
+ zlib_ada_AdaStatic)
+
+ ada_find_ali(zlib_ada_buffer-demoStatic)
+
+ add_test(NAME zlib_ada_buffer-demoStatic
+ COMMAND zlib_ada_buffer-demoStatic)
+
+ ada_add_executable(zlib_ada_mtestStatic ${zlibAda_SOURCE_DIR}/mtest.adb)
+
+ target_link_libraries(zlib_ada_mtestStatic
+ PRIVATE
+ zlib_ada_AdaStatic)
+
+ ada_find_ali(zlib_ada_mtestStatic)
+
+ # Not adding test as this is an endless-loop
+
+ ada_add_executable(zlib_ada_readStatic ${zlibAda_SOURCE_DIR}/read.adb)
+
+ target_link_libraries(zlib_ada_readStatic
+ PRIVATE
+ zlib_ada_AdaStatic)
+
+ ada_find_ali(zlib_ada_readStatic)
+
+ add_test(NAME zlib_ada_readStatic COMMAND zlib_ada_readStatic)
+endif(ZLIB_ADA_BUILD_STATIC)
+
+add_test(NAME zlib_ada_cleanup
+ COMMAND ${CMAKE_COMMAND} -E rm
+ ${CMAKE_CURRENT_BINARY_DIR}/testzlib.in
+ ${CMAKE_CURRENT_BINARY_DIR}/testzlib.out
+ ${CMAKE_CURRENT_BINARY_DIR}/testzlib.zlb)
+set_tests_properties(zlib_ada_cleanup
+ PROPERTIES
+ FIXTURES_CLEANUP zlib_ada_cleanup)