From a96d6a98d3c8b6a8bae8a4ac182787ae72e10f2c Mon Sep 17 00:00:00 2001 From: Brad King Date: Fri, 13 Dec 2024 08:24:50 -0500 Subject: [PATCH] Tests/RunCMake/XcodeProject: Improve XcodeSchemaProperty failure messages --- .../XcodeSchemaProperty-check.cmake | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/Tests/RunCMake/XcodeProject/XcodeSchemaProperty-check.cmake b/Tests/RunCMake/XcodeProject/XcodeSchemaProperty-check.cmake index 6bad52738e..732f123dd6 100644 --- a/Tests/RunCMake/XcodeProject/XcodeSchemaProperty-check.cmake +++ b/Tests/RunCMake/XcodeProject/XcodeSchemaProperty-check.cmake @@ -3,21 +3,34 @@ function(check_property property matcher) file(STRINGS ${schema} actual-${property} REGEX "${matcher}" LIMIT_COUNT 1) if(NOT actual-${property}) - message(SEND_ERROR "Xcode schema property ${property}: Could not find ${matcher} in schema ${schema}") + string(APPEND RunCMake_TEST_FAILED + "Xcode schema property ${property}: Could not find\n" + " ${matcher}\n" + "in schema\n" + " ${schema}\n" + ) + set(RunCMake_TEST_FAILED "${RunCMake_TEST_FAILED}" PARENT_SCOPE) endif() endfunction() function(expect_schema target) set(schema "${RunCMake_TEST_BINARY_DIR}/XcodeSchemaProperty.xcodeproj/xcshareddata/xcschemes/${target}.xcscheme") if(NOT EXISTS ${schema}) - message(SEND_ERROR "Missing schema for target ${target}") + string(APPEND RunCMake_TEST_FAILED + "Missing schema for target ${target}\n" + ) + set(RunCMake_TEST_FAILED "${RunCMake_TEST_FAILED}" PARENT_SCOPE) endif() endfunction() function(expect_no_schema target) set(schema "${RunCMake_TEST_BINARY_DIR}/XcodeSchemaProperty.xcodeproj/xcshareddata/xcschemes/${target}.xcscheme") if(EXISTS ${schema}) - message(SEND_ERROR "Found unexpected schema ${schema}") + string(APPEND RunCMake_TEST_FAILED + "Found unexpected schema\n" + " ${schema}\n" + ) + set(RunCMake_TEST_FAILED "${RunCMake_TEST_FAILED}" PARENT_SCOPE) endif() endfunction()