From 8d48d755f0f38eef91df764c350826ad6bb38a7e Mon Sep 17 00:00:00 2001 From: scivision Date: Tue, 5 May 2026 13:27:03 -0400 Subject: [PATCH] Tests: Add missing execute_process result checks --- Tests/FindPackageModeMakefileTest/CMakeLists.txt | 5 +++-- Tests/RunCMake/CMakeLists.txt | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Tests/FindPackageModeMakefileTest/CMakeLists.txt b/Tests/FindPackageModeMakefileTest/CMakeLists.txt index 0b15be8cf7..a9bcfc4be6 100644 --- a/Tests/FindPackageModeMakefileTest/CMakeLists.txt +++ b/Tests/FindPackageModeMakefileTest/CMakeLists.txt @@ -9,9 +9,10 @@ if(UNIX AND "${CMAKE_GENERATOR}" MATCHES "Makefile" AND execute_process(COMMAND ${CMAKE_MAKE_PROGRAM} -v OUTPUT_VARIABLE makeVersionOutput ERROR_QUIET - TIMEOUT 10) + TIMEOUT 10 + RESULT_VARIABLE _make_result) string(TOUPPER "${makeVersionOutput}" MAKE_VERSION_OUTPUT) - if("${MAKE_VERSION_OUTPUT}" MATCHES "GNU MAKE") + if(_make_result EQUAL 0 AND "${MAKE_VERSION_OUTPUT}" MATCHES "GNU MAKE") # build a library which we can search during the test add_library(foo STATIC foo.cpp) diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt index 62619473ca..8bf0af3f82 100644 --- a/Tests/RunCMake/CMakeLists.txt +++ b/Tests/RunCMake/CMakeLists.txt @@ -1231,8 +1231,9 @@ if("${CMAKE_GENERATOR}" MATCHES "Make|Ninja|FASTBuild") if(UNIX AND NOT CYGWIN) execute_process(COMMAND ldd --help OUTPUT_VARIABLE LDD_HELP - ERROR_VARIABLE LDD_ERR) - if("${LDD_HELP}" MATCHES + ERROR_VARIABLE LDD_ERR + RESULT_VARIABLE LDD_RESULT) + if(LDD_RESULT EQUAL 0 AND "${LDD_HELP}" MATCHES "(-r, --function-relocs.*process data and function relocations.*-u, --unused.*print unused direct dependencies)") add_RunCMake_test(LinkWhatYouUse) endif()