Commit c95cdea for zlib
commit c95cdea223c1ba8283dd4b1ae71a834bb35839a1
Author: Vollstrecker <werner@vollstreckernet.de>
Date: Sat Feb 28 11:32:04 2026 +0100
CMake: Move blast tests into test directory.
diff --git a/contrib/blast/CMakeLists.txt b/contrib/blast/CMakeLists.txt
index 1c40a99..cbfc412 100644
--- a/contrib/blast/CMakeLists.txt
+++ b/contrib/blast/CMakeLists.txt
@@ -28,21 +28,6 @@ if(WIN32 OR CYGWIN)
set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
endif(WIN32 OR CYGWIN)
-function(blast_findTestEnv testName)
- set(testEnv "PATH=")
-
- if(MSVC OR MINGW)
- set(separator "\\\;")
- else()
- set(separator ":")
- endif()
-
- string(APPEND testEnv "$<TARGET_FILE_DIR:BLAST::BLAST>${separator}")
- string(APPEND testEnv "$ENV{PATH}")
-
- set_tests_properties(${testName} PROPERTIES ENVIRONMENT "${testEnv}")
-endfunction(blast_findTestEnv testName)
-
if(ZLIB_BLAST_BUILD_SHARED)
add_library(${ZLIB_CONTRIB_PREFIX}blast_blast SHARED
blast.c
@@ -61,34 +46,6 @@ if(ZLIB_BLAST_BUILD_SHARED)
PROPERTIES
EXPORT_NAME BLAST
OUTPUT_NAME blast)
-
- if(ZLIB_BLAST_BUILD_TESTING)
- enable_testing()
- add_executable(${ZLIB_CONTRIB_PREFIX}blast_test blast-test.c)
- target_link_libraries(${ZLIB_CONTRIB_PREFIX}blast_test
- PRIVATE
- ${ZLIB_CONTRIB_PREFIX}blast_blast)
-
- add_test(NAME ${ZLIB_CONTRIB_PREFIX}blast_test
- COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_SOURCE_DIR}/tester.cmake
- "$<TARGET_FILE:${ZLIB_CONTRIB_PREFIX}blast_test>"
- "${CMAKE_CURRENT_SOURCE_DIR}"
- "${CMAKE_CURRENT_BINARY_DIR}")
- set_tests_properties(${ZLIB_CONTRIB_PREFIX}blast_test
- PROPERTIES
- RESOURCE_LOCK blast_test_files)
-
- if(MSVC
- OR MSYS
- OR MINGW
- OR CYGWIN)
- blast_findtestenv(${ZLIB_CONTRIB_PREFIX}blast_test)
- endif(
- MSVC
- OR MSYS
- OR MINGW
- OR CYGWIN)
- endif(ZLIB_BLAST_BUILD_TESTING)
endif(ZLIB_BLAST_BUILD_SHARED)
if(ZLIB_BLAST_BUILD_STATIC)
@@ -102,25 +59,10 @@ if(ZLIB_BLAST_BUILD_STATIC)
PROPERTIES
EXPORT_NAME BLASTSTATIC
OUTPUT_NAME blast${${ZLIB_CONTRIB_PREFIX}blast_static_suffix})
-
- if(ZLIB_BLAST_BUILD_TESTING)
- enable_testing()
- add_executable(${ZLIB_CONTRIB_PREFIX}blast_testStatic blast-test.c)
- target_link_libraries(${ZLIB_CONTRIB_PREFIX}blast_testStatic
- PRIVATE ${ZLIB_CONTRIB_PREFIX}blast_blastStatic)
-
- add_test(NAME ${ZLIB_CONTRIB_PREFIX}blast_testStatic
- COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_SOURCE_DIR}/tester.cmake
- "$<TARGET_FILE:${ZLIB_CONTRIB_PREFIX}blast_testStatic>"
- "${CMAKE_CURRENT_SOURCE_DIR}"
- "${CMAKE_CURRENT_BINARY_DIR}")
- set_tests_properties(${ZLIB_CONTRIB_PREFIX}blast_testStatic
- PROPERTIES
- RESOURCE_LOCK blast_test_files)
- endif(ZLIB_BLAST_BUILD_TESTING)
endif(ZLIB_BLAST_BUILD_STATIC)
if(ZLIB_BLAST_BUILD_TESTING)
+ enable_testing()
add_subdirectory(test)
endif(ZLIB_BLAST_BUILD_TESTING)
diff --git a/contrib/blast/test/CMakeLists.txt b/contrib/blast/test/CMakeLists.txt
index cdcd83e..566561a 100644
--- a/contrib/blast/test/CMakeLists.txt
+++ b/contrib/blast/test/CMakeLists.txt
@@ -17,6 +17,21 @@ if(NOT DEFINED ZLIB_BUILD_BLAST)
FIXTURES_SETUP blast_install)
endif(NOT DEFINED ZLIB_BUILD_BLAST)
+function(blast_findTestEnv testName)
+ set(testEnv "PATH=")
+
+ if(MSVC OR MINGW)
+ set(separator "\\\;")
+ else()
+ set(separator ":")
+ endif()
+
+ string(APPEND testEnv "$<TARGET_FILE_DIR:BLAST::BLAST>${separator}")
+ string(APPEND testEnv "$ENV{PATH}")
+
+ set_tests_properties(${testName} PROPERTIES ENVIRONMENT "${testEnv}")
+endfunction(blast_findTestEnv testName)
+
configure_file(
${CMAKE_CURRENT_SOURCE_DIR}/find_package_test.cmake.in
${WORK_DIR}/blast_find_package_test/CMakeLists.txt @ONLY)
@@ -197,3 +212,50 @@ set_tests_properties(${ZLIB_CONTRIB_PREFIX}blast_find_package_wrong_components_c
PROPERTIES
FIXTURES_REQUIRED ${inst_setup}
WILL_FAIL TRUE)
+
+###########################################################################################################################################
+
+
+if(ZLIB_BLAST_BUILD_SHARED)
+ add_executable(${ZLIB_CONTRIB_PREFIX}blast_test
+ ${blast_SOURCE_DIR}/blast-test.c)
+ target_link_libraries(${ZLIB_CONTRIB_PREFIX}blast_test
+ PRIVATE
+ ${ZLIB_CONTRIB_PREFIX}blast_blast)
+
+ add_test(NAME ${ZLIB_CONTRIB_PREFIX}blast_test
+ COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_SOURCE_DIR}/tester.cmake
+ "$<TARGET_FILE:${ZLIB_CONTRIB_PREFIX}blast_test>"
+ "${CMAKE_CURRENT_SOURCE_DIR}"
+ "${CMAKE_CURRENT_BINARY_DIR}")
+ set_tests_properties(${ZLIB_CONTRIB_PREFIX}blast_test
+ PROPERTIES
+ RESOURCE_LOCK blast_test_files)
+
+ if(MSVC
+ OR MSYS
+ OR MINGW
+ OR CYGWIN)
+ blast_findtestenv(${ZLIB_CONTRIB_PREFIX}blast_test)
+ endif(
+ MSVC
+ OR MSYS
+ OR MINGW
+ OR CYGWIN)
+endif(ZLIB_BLAST_BUILD_SHARED)
+
+if(ZLIB_BLAST_BUILD_STATIC)
+ add_executable(${ZLIB_CONTRIB_PREFIX}blast_testStatic
+ ${blast_SOURCE_DIR}/blast-test.c)
+ target_link_libraries(${ZLIB_CONTRIB_PREFIX}blast_testStatic
+ PRIVATE ${ZLIB_CONTRIB_PREFIX}blast_blastStatic)
+
+ add_test(NAME ${ZLIB_CONTRIB_PREFIX}blast_testStatic
+ COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_SOURCE_DIR}/tester.cmake
+ "$<TARGET_FILE:${ZLIB_CONTRIB_PREFIX}blast_testStatic>"
+ "${CMAKE_CURRENT_SOURCE_DIR}"
+ "${CMAKE_CURRENT_BINARY_DIR}")
+ set_tests_properties(${ZLIB_CONTRIB_PREFIX}blast_testStatic
+ PROPERTIES
+ RESOURCE_LOCK blast_test_files)
+endif(ZLIB_BLAST_BUILD_STATIC)
diff --git a/contrib/blast/test.pk b/contrib/blast/test/test.pk
similarity index 100%
rename from contrib/blast/test.pk
rename to contrib/blast/test/test.pk
diff --git a/contrib/blast/test.txt b/contrib/blast/test/test.txt
similarity index 100%
rename from contrib/blast/test.txt
rename to contrib/blast/test/test.txt
diff --git a/contrib/blast/tester.cmake b/contrib/blast/test/tester.cmake
similarity index 100%
rename from contrib/blast/tester.cmake
rename to contrib/blast/test/tester.cmake