mirrors/cmake
2
0
Fork 0
mirror of https://gitlab.kitware.com/cmake/cmake.git synced 2026-09-25 04:09:36 +03:00
Code Activity

Tests/Instrumentation: Fix exponential output spam from validate_json_schema

Browse Source 
Schema validations in Tests/Instrumentation called add_error("${RunCMake_TEST_FAILED}")
in a loop. Because add_error itself appends the input to RunCMake_TEST_FAILED, this
resulted in exponential growth of error messages on each loop iteration, filling the
test log with duplicate errors.

Isolate error messages from validate_json_schema to avoid exponential duplication.
This commit is contained in:
Martin Duffy
2026-09-16 13:12:03 -04:00
parent 27408540d4
commit ff48c8d4d2
2 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tests/RunCMake/Instrumentation/check-query-dir.cmake
+12 -7
View File
@@ -6,15 +6,20 @@ set(schema_file "${CMAKE_CURRENT_LIST_DIR}/../../../Help/manual/instrumentation/
file(GLOB_RECURSE queries LIST_DIRECTORIES false ${v1}/query/*)
foreach(query ${queries})
validate_json_schema(
"${schema_file}" "${query}"
EXPECTED_RESULT "${schema_validate_result}"
)
if (RunCMake_TEST_FAILED)
add_error("${RunCMake_TEST_FAILED}")
block(SCOPE_FOR VARIABLES PROPAGATE schema_error)
# Capture only the error message from this validate_json_chema call
set(RunCMake_TEST_FAILED "")
validate_json_schema(
"${schema_file}" "${query}"
EXPECTED_RESULT "${schema_validate_result}"
)
set(schema_error "${RunCMake_TEST_FAILED}")
endblock()
if (schema_error)
add_error("${schema_error}")
endif()
endforeach()
if (ERROR_MESSAGE)
message(FATAL_ERROR ${ERROR_MESSAGE})
message(FATAL_ERROR "${ERROR_MESSAGE}")
endif()
Tests/RunCMake/Instrumentation/verify-snippet.cmake
+8 -3
View File
@@ -112,9 +112,14 @@ function(verify_snippet_file snippet contents)
endif()
set(snippet_schema "${CMAKE_CURRENT_LIST_DIR}/../../../Help/manual/instrumentation/snippet-v1-schema.json")
validate_json_schema("${snippet_schema}" "${snippet}")
if (RunCMake_TEST_FAILED)
add_error("${RunCMake_TEST_FAILED}")
block(SCOPE_FOR VARIABLES PROPAGATE schema_error)
# Capture only the error message from this validate_json_chema call
set(RunCMake_TEST_FAILED "")
validate_json_schema("${snippet_schema}" "${snippet}")
set(schema_error "${RunCMake_TEST_FAILED}")
endblock()
if (schema_error)
add_error("${schema_error}")
endif()
return(PROPAGATE ERROR_MESSAGE RunCMake_TEST_FAILED role)