mirror of
https://github.com/Kitware/CMake.git
synced 2025-10-14 02:08:27 +08:00
Tests: Factor out RunCMake.CMakePresets schema validation
Make it available to similar tests. Also fix whitespace in generated error message.
This commit is contained in:
@@ -9,21 +9,7 @@ endif()
|
||||
|
||||
set(RunCMake-check-file check.cmake)
|
||||
|
||||
function(validate_schema file expected_result)
|
||||
execute_process(
|
||||
COMMAND "${PYTHON_EXECUTABLE}" "${RunCMake_SOURCE_DIR}/validate_schema.py" "${file}"
|
||||
RESULT_VARIABLE _result
|
||||
OUTPUT_VARIABLE _output
|
||||
ERROR_VARIABLE _error
|
||||
)
|
||||
if(NOT _result STREQUAL expected_result)
|
||||
string(REPLACE "\n" "\n" _output_p "${_output}")
|
||||
string(REPLACE "\n" "\n" _error_p "${_error}")
|
||||
string(APPEND RunCMake_TEST_FAILED "Expected result of validating ${file}: ${expected_result}\nActual result: ${_result}\nOutput:\n${_output_p}\nError:\n${_error_p}")
|
||||
endif()
|
||||
|
||||
set(RunCMake_TEST_FAILED "${RunCMake_TEST_FAILED}" PARENT_SCOPE)
|
||||
endfunction()
|
||||
include("${RunCMake_SOURCE_DIR}/validate_schema.cmake")
|
||||
|
||||
function(run_cmake_presets name)
|
||||
set(RunCMake_TEST_SOURCE_DIR "${RunCMake_BINARY_DIR}/${name}")
|
||||
|
19
Tests/RunCMake/CMakePresets/validate_schema.cmake
Normal file
19
Tests/RunCMake/CMakePresets/validate_schema.cmake
Normal file
@@ -0,0 +1,19 @@
|
||||
function(validate_schema file expected_result)
|
||||
if (NOT CMakePresets_VALIDATE_SCRIPT_PATH)
|
||||
set(CMakePresets_VALIDATE_SCRIPT_PATH "${RunCMake_SOURCE_DIR}/validate_schema.py")
|
||||
endif()
|
||||
|
||||
execute_process(
|
||||
COMMAND "${PYTHON_EXECUTABLE}" "${CMakePresets_VALIDATE_SCRIPT_PATH}" "${file}"
|
||||
RESULT_VARIABLE _result
|
||||
OUTPUT_VARIABLE _output
|
||||
ERROR_VARIABLE _error
|
||||
)
|
||||
if(NOT _result STREQUAL expected_result)
|
||||
string(REPLACE "\n" "\n " _output_p "${_output}")
|
||||
string(REPLACE "\n" "\n " _error_p "${_error}")
|
||||
string(APPEND RunCMake_TEST_FAILED "Expected result of validating ${file}: ${expected_result}\nActual result: ${_result}\nOutput:\n ${_output_p}\nError:\n ${_error_p}\n")
|
||||
endif()
|
||||
|
||||
set(RunCMake_TEST_FAILED "${RunCMake_TEST_FAILED}" PARENT_SCOPE)
|
||||
endfunction()
|
Reference in New Issue
Block a user