aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorVollstrecker <werner@vollstreckernet.de>2024-12-11 09:12:30 +0100
committerMark Adler <madler@alumni.caltech.edu>2025-01-31 19:59:10 -0800
commit920385267f71cd451754f83366f8bf2df1c9eb21 (patch)
treea2387578c12e5d30ee523db6fac497698184c346 /test
parentd7afcaa2be30fd2413d5f79293e5841579b56be9 (diff)
downloadzlib-920385267f71cd451754f83366f8bf2df1c9eb21.tar.gz
zlib-920385267f71cd451754f83366f8bf2df1c9eb21.tar.bz2
zlib-920385267f71cd451754f83366f8bf2df1c9eb21.zip
CMake: Fix parallel testing.
Diffstat (limited to 'test')
-rw-r--r--test/CMakeLists.txt29
1 files changed, 16 insertions, 13 deletions
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index c5d8ad1..b274553 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -4,6 +4,10 @@ add_test(NAME zlib_install
4 --config $<CONFIG> 4 --config $<CONFIG>
5 WORKING_DIRECTORY ${zlib_BINARY_DIR}) 5 WORKING_DIRECTORY ${zlib_BINARY_DIR})
6 6
7set_tests_properties(zlib_install
8 PROPERTIES
9 FIXTURES_SETUP zlib_install)
10
7file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/findpackage_test) 11file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/findpackage_test)
8file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectoy_test) 12file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectoy_test)
9file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_exclude_test) 13file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_exclude_test)
@@ -49,18 +53,15 @@ add_test(NAME zlib_test_find_package
49 COMMAND ${CMAKE_CTEST_COMMAND} -C $<CONFIG> 53 COMMAND ${CMAKE_CTEST_COMMAND} -C $<CONFIG>
50 WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/findpackage_test_build) 54 WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/findpackage_test_build)
51 55
52set_tests_properties(zlib_test_install PROPERTIES 56set_tests_properties(zlib_configure_find_package PROPERTIES
53 FIXTURES_SETUP install) 57 FIXTURES_REQUIRED zlib_install
54
55set_tests_properties(zlib_test_configure_find_package PROPERTIES
56 FIXTURES_REQUIRED install
57 FIXTURES_SETUP fp_config) 58 FIXTURES_SETUP fp_config)
58 59
59set_tests_properties(zlib_test_build_find_package PROPERTIES 60set_tests_properties(zlib_build_find_package PROPERTIES
60 FIXTURES_REQUIRED fp_config 61 FIXTURES_REQUIRED fp_config
61 FIXTURES_SETUP fp_build) 62 FIXTURES_SETUP fp_build)
62 63
63set_tests_properties(zlib_test_test_find_package PROPERTIES 64set_tests_properties(zlib_test_find_package PROPERTIES
64 FIXTURES_REQUIRED fp_build 65 FIXTURES_REQUIRED fp_build
65 ENVIRONMENT CTEST_OUTPUT_ON_FAILURE=1) 66 ENVIRONMENT CTEST_OUTPUT_ON_FAILURE=1)
66 67
@@ -88,14 +89,15 @@ add_test(NAME zlib_test_add_subdirectory
88 COMMAND ${CMAKE_CTEST_COMMAND} -C $<CONFIG> 89 COMMAND ${CMAKE_CTEST_COMMAND} -C $<CONFIG>
89 WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_test_build) 90 WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_test_build)
90 91
91set_tests_properties(zlib_test_configure_add_subdirectory PROPERTIES 92set_tests_properties(zlib_configure_add_subdirectory PROPERTIES
93 FIXTURES_REQUIRED zlib_install
92 FIXTURES_SETUP as_config) 94 FIXTURES_SETUP as_config)
93 95
94set_tests_properties(zlib_test_build_add_subdirectory PROPERTIES 96set_tests_properties(zlib_build_add_subdirectory PROPERTIES
95 FIXTURES_REQUIRED as_config 97 FIXTURES_REQUIRED as_config
96 FIXTURES_SETUP as_build) 98 FIXTURES_SETUP as_build)
97 99
98set_tests_properties(zlib_test_test_add_subdirectory PROPERTIES 100set_tests_properties(zlib_test_add_subdirectory PROPERTIES
99 FIXTURES_REQUIRED as_build 101 FIXTURES_REQUIRED as_build
100 ENVIRONMENT CTEST_OUTPUT_ON_FAILURE=1) 102 ENVIRONMENT CTEST_OUTPUT_ON_FAILURE=1)
101 103
@@ -123,13 +125,14 @@ add_test(NAME zlib_test_add_subdirectory_exclude
123 COMMAND ${CMAKE_CTEST_COMMAND} -C $<CONFIG> 125 COMMAND ${CMAKE_CTEST_COMMAND} -C $<CONFIG>
124 WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_exclude_test_build) 126 WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_exclude_test_build)
125 127
126set_tests_properties(zlib_test_configure_add_subdirectory_exclude PROPERTIES 128set_tests_properties(zlib_configure_add_subdirectory_exclude PROPERTIES
129 FIXTURES_REQUIRED zlib_install
127 FIXTURES_SETUP asx_config) 130 FIXTURES_SETUP asx_config)
128 131
129set_tests_properties(zlib_test_build_add_subdirectory_exclude PROPERTIES 132set_tests_properties(zlib_build_add_subdirectory_exclude PROPERTIES
130 FIXTURES_REQUIRED as_config 133 FIXTURES_REQUIRED as_config
131 FIXTURES_SETUP asx_build) 134 FIXTURES_SETUP asx_build)
132 135
133set_tests_properties(zlib_test_test_add_subdirectory_exclude PROPERTIES 136set_tests_properties(zlib_test_add_subdirectory_exclude PROPERTIES
134 FIXTURES_REQUIRED asx_build 137 FIXTURES_REQUIRED asx_build
135 ENVIRONMENT CTEST_OUTPUT_ON_FAILURE=1) 138 ENVIRONMENT CTEST_OUTPUT_ON_FAILURE=1)