dilim/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-06-30 19:57:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Tests: Fix RunCMake.include_external_msproject .sln check failure

Browse Source 
Accumulate failures instead of only considering the last case.
This commit is contained in:
Brad King
2026-01-19 15:47:58 -05:00
parent d6a62d17ca
commit 00db01ddcd
1 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Tests/RunCMake/include_external_msproject/check_utils.cmake
View File

@@ -90,8 +90,6 @@ endfunction()
# RunCMake test check helper
function(check_project test name guid type platform imported_release_config_name)
set(sln "${RunCMake_TEST_BINARY_DIR}/${test}.sln")
set(sep "")
set(failed "")
if(NOT type)
set(type 8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942)
endif()
@@ -112,27 +110,23 @@ function(check_project test name guid type platform imported_release_config_name
if(guid)
check_project_guid("${sln}" "${name}" "${guid}" passed_guid)
if(NOT passed_guid)
string(APPEND failed "${sep}${name} solution has no project with expected GUID=${guid}")
set(sep "\n")
string(APPEND RunCMake_TEST_FAILED "${name} solution has no project with expected GUID=${guid}\n")
endif()
else()
set(passed_guid 1)
endif()
check_project_type("${sln}" "${name}" "${type}" passed_type)
if(NOT passed_type)
string(APPEND failed "${sep}${name} solution has no project with expected TYPE=${type}")
set(sep "\n")
string(APPEND RunCMake_TEST_FAILED "${name} solution has no project with expected TYPE=${type}\n")
endif()
check_custom_platform("${sln}" "${name}" "${platform}" passed_platform)
if(NOT passed_platform)
string(APPEND failed "${sep}${name} solution has no project with expected PLATFORM=${platform}")
set(sep "\n")
string(APPEND RunCMake_TEST_FAILED "${name} solution has no project with expected PLATFORM=${platform}\n")
endif()
check_custom_configuration("${sln}" "${name}" "Release" "${imported_release_config_name}" passed_configuration)
if(NOT passed_configuration)
string(APPEND failed "${sep}${name} solution has no project with expected CONFIG=${imported_release_config_name}")
set(sep "\n")
string(APPEND RunCMake_TEST_FAILED "${name} solution has no project with expected CONFIG=${imported_release_config_name}\n")
endif()
set(RunCMake_TEST_FAILED "${failed}" PARENT_SCOPE)
set(RunCMake_TEST_FAILED "${RunCMake_TEST_FAILED}" PARENT_SCOPE)
endfunction()