From 920385267f71cd451754f83366f8bf2df1c9eb21 Mon Sep 17 00:00:00 2001 From: Vollstrecker Date: Wed, 11 Dec 2024 09:12:30 +0100 Subject: CMake: Fix parallel testing. --- test/CMakeLists.txt | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) (limited to 'test') 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 --config $ WORKING_DIRECTORY ${zlib_BINARY_DIR}) +set_tests_properties(zlib_install + PROPERTIES + FIXTURES_SETUP zlib_install) + file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/findpackage_test) file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectoy_test) file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_exclude_test) @@ -49,18 +53,15 @@ add_test(NAME zlib_test_find_package COMMAND ${CMAKE_CTEST_COMMAND} -C $ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/findpackage_test_build) -set_tests_properties(zlib_test_install PROPERTIES - FIXTURES_SETUP install) - -set_tests_properties(zlib_test_configure_find_package PROPERTIES - FIXTURES_REQUIRED install +set_tests_properties(zlib_configure_find_package PROPERTIES + FIXTURES_REQUIRED zlib_install FIXTURES_SETUP fp_config) -set_tests_properties(zlib_test_build_find_package PROPERTIES +set_tests_properties(zlib_build_find_package PROPERTIES FIXTURES_REQUIRED fp_config FIXTURES_SETUP fp_build) -set_tests_properties(zlib_test_test_find_package PROPERTIES +set_tests_properties(zlib_test_find_package PROPERTIES FIXTURES_REQUIRED fp_build ENVIRONMENT CTEST_OUTPUT_ON_FAILURE=1) @@ -88,14 +89,15 @@ add_test(NAME zlib_test_add_subdirectory COMMAND ${CMAKE_CTEST_COMMAND} -C $ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_test_build) -set_tests_properties(zlib_test_configure_add_subdirectory PROPERTIES +set_tests_properties(zlib_configure_add_subdirectory PROPERTIES + FIXTURES_REQUIRED zlib_install FIXTURES_SETUP as_config) -set_tests_properties(zlib_test_build_add_subdirectory PROPERTIES +set_tests_properties(zlib_build_add_subdirectory PROPERTIES FIXTURES_REQUIRED as_config FIXTURES_SETUP as_build) -set_tests_properties(zlib_test_test_add_subdirectory PROPERTIES +set_tests_properties(zlib_test_add_subdirectory PROPERTIES FIXTURES_REQUIRED as_build ENVIRONMENT CTEST_OUTPUT_ON_FAILURE=1) @@ -123,13 +125,14 @@ add_test(NAME zlib_test_add_subdirectory_exclude COMMAND ${CMAKE_CTEST_COMMAND} -C $ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_exclude_test_build) -set_tests_properties(zlib_test_configure_add_subdirectory_exclude PROPERTIES +set_tests_properties(zlib_configure_add_subdirectory_exclude PROPERTIES + FIXTURES_REQUIRED zlib_install FIXTURES_SETUP asx_config) -set_tests_properties(zlib_test_build_add_subdirectory_exclude PROPERTIES +set_tests_properties(zlib_build_add_subdirectory_exclude PROPERTIES FIXTURES_REQUIRED as_config FIXTURES_SETUP asx_build) -set_tests_properties(zlib_test_test_add_subdirectory_exclude PROPERTIES +set_tests_properties(zlib_test_add_subdirectory_exclude PROPERTIES FIXTURES_REQUIRED asx_build ENVIRONMENT CTEST_OUTPUT_ON_FAILURE=1) -- cgit v1.2.3-55-g6feb