mirror of
https://gitlab.kitware.com/cmake/cmake.git
synced 2026-09-25 04:09:36 +03:00
Martin Duffy
ff48c8d4d2
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.
26 lines
842 B
CMake
26 lines
842 B
CMake
include(${CMAKE_CURRENT_LIST_DIR}/verify-snippet.cmake)
|
|
include(${CMAKE_CURRENT_LIST_DIR}/json.cmake)
|
|
include(${CMAKE_CURRENT_LIST_DIR}/../validate_json_schema.cmake)
|
|
|
|
set(schema_file "${CMAKE_CURRENT_LIST_DIR}/../../../Help/manual/instrumentation/query-v1-schema.json")
|
|
|
|
file(GLOB_RECURSE queries LIST_DIRECTORIES false ${v1}/query/*)
|
|
foreach(query ${queries})
|
|
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}")
|
|
endif()
|