From 0c2610bd300218165e72524b87e998fd06d86ef5 Mon Sep 17 00:00:00 2001 From: Brad King Date: Mon, 12 Jun 2023 17:53:20 -0400 Subject: Tests: Find GIT_EXECUTABLE early enough to use in all tests Some tests work only if a `git` executable is available. --- Tests/CMakeLists.txt | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index 5ef77fd..53bb1e6 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -142,6 +142,9 @@ if(BUILD_TESTING) ) endif() + # Look for git to use for tests. + find_program(GIT_EXECUTABLE NAMES git) + # Look for rpmbuild to use for tests. # The tool does not work with spaces in the path. if(NOT CMAKE_CURRENT_BINARY_DIR MATCHES " ") @@ -2688,10 +2691,6 @@ if(BUILD_TESTING) endif() # Test CTest Update with GIT - if(NOT DEFINED CMake_TEST_CTestUpdate_GIT OR CMake_TEST_CTestUpdate_GIT) - find_program(GIT_EXECUTABLE NAMES git) - mark_as_advanced(GIT_EXECUTABLE) - endif() if(NOT DEFINED CMake_TEST_CTestUpdate_GIT AND GIT_EXECUTABLE AND (UNIX OR NOT "${GIT_EXECUTABLE}" MATCHES "cygwin")) set(CMake_TEST_CTestUpdate_GIT 1) -- cgit v0.12 From 15d9d591bd8560284ec8b82b022ba0135ae58f82 Mon Sep 17 00:00:00 2001 From: Brad King Date: Mon, 12 Jun 2023 17:56:53 -0400 Subject: Tests: Require git to enable RunCMake.CMP0150 test The test added by commit 550f63447d (ExternalProject/FetchContent: Support relative remote URLs, 2023-04-21, v3.27.0-rc1~156^2) covers Git-specific functionality, and requires a `git` tool to be available. --- Tests/RunCMake/CMakeLists.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt index d4f3341..f089a96 100644 --- a/Tests/RunCMake/CMakeLists.txt +++ b/Tests/RunCMake/CMakeLists.txt @@ -160,7 +160,10 @@ endif() add_RunCMake_test(CMP0132) add_RunCMake_test(CMP0135) add_RunCMake_test(CMP0139) -add_RunCMake_test(CMP0150) + +if(GIT_EXECUTABLE) + add_RunCMake_test(CMP0150) +endif() # The test for Policy 65 requires the use of the # CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS variable, which both the VS and Xcode -- cgit v0.12