From a7534c31e6f9309ec2a2418d8b6c167bf1be150d Mon Sep 17 00:00:00 2001 From: Kyle Edwards Date: Tue, 19 Sep 2023 09:49:19 -0400 Subject: [PATCH] Tests: Update tests to run in multi-config generators --- Tests/CMakeLists.txt | 4 ++++ Tests/FindGLUT/CMakeLists.txt | 2 +- Tests/FindGSL/CMakeLists.txt | 2 +- Tests/FindOpenSSL/CMakeLists.txt | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index 7a71c0a4c0..cd9cc1710b 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -142,6 +142,10 @@ if(BUILD_TESTING) ) endif() + if(_isMultiConfig) + set(test_options -C Debug) + endif() + # Look for git to use for tests. find_program(GIT_EXECUTABLE NAMES git) diff --git a/Tests/FindGLUT/CMakeLists.txt b/Tests/FindGLUT/CMakeLists.txt index e75ec408bf..fc9ed08799 100644 --- a/Tests/FindGLUT/CMakeLists.txt +++ b/Tests/FindGLUT/CMakeLists.txt @@ -5,5 +5,5 @@ add_test(NAME FindGLUT.Test COMMAND ${CMAKE_CTEST_COMMAND} ${build_generator_args} --build-project TestFindGLUT --build-options ${build_options} - --test-command ${CMAKE_CTEST_COMMAND} -V + --test-command ${CMAKE_CTEST_COMMAND} -V ${test_options} ) diff --git a/Tests/FindGSL/CMakeLists.txt b/Tests/FindGSL/CMakeLists.txt index 45a347102c..594a34e8aa 100644 --- a/Tests/FindGSL/CMakeLists.txt +++ b/Tests/FindGSL/CMakeLists.txt @@ -5,5 +5,5 @@ add_test(NAME FindGSL.rng COMMAND ${CMAKE_CTEST_COMMAND} ${build_generator_args} --build-project FindGSL_rng --build-options ${build_options} - --test-command ${CMAKE_CTEST_COMMAND} -V + --test-command ${CMAKE_CTEST_COMMAND} -V ${test_options} ) diff --git a/Tests/FindOpenSSL/CMakeLists.txt b/Tests/FindOpenSSL/CMakeLists.txt index 66b3fb2991..9a7a61cc25 100644 --- a/Tests/FindOpenSSL/CMakeLists.txt +++ b/Tests/FindOpenSSL/CMakeLists.txt @@ -5,5 +5,5 @@ add_test(NAME FindOpenSSL.rand COMMAND ${CMAKE_CTEST_COMMAND} ${build_generator_args} --build-project FindOpenSSL_rand --build-options ${build_options} - --test-command ${CMAKE_CTEST_COMMAND} -V + --test-command ${CMAKE_CTEST_COMMAND} -V ${test_options} )