mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-23 22:58:37 -05:00
Code Issues Packages Projects Releases Wiki Activity

Tests: Reverse RunCMake code path order

Browse Source
This commit is contained in:
Brad King
2021-03-09 06:52:53 -05:00
parent 6fd7e8c53f
commit f4d154755a
1 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tests/RunCMake/RunCMake.cmake
+15 -15
View File
@@ -91,21 +91,7 @@ function(run_cmake test)
else() else()
set(maybe_input_file "") set(maybe_input_file "")
endif() endif()
if(RunCMake_TEST_COMMAND) if(NOT RunCMake_TEST_COMMAND)
if(NOT RunCMake_TEST_COMMAND_WORKING_DIRECTORY)
set(RunCMake_TEST_COMMAND_WORKING_DIRECTORY "${RunCMake_TEST_BINARY_DIR}")
endif()
execute_process(
COMMAND ${RunCMake_TEST_COMMAND}
WORKING_DIRECTORY "${RunCMake_TEST_COMMAND_WORKING_DIRECTORY}"
OUTPUT_VARIABLE actual_stdout
ERROR_VARIABLE ${actual_stderr_var}
RESULT_VARIABLE actual_result
ENCODING UTF8
${maybe_timeout}
${maybe_input_file}
)
else()
if(RunCMake_GENERATOR_INSTANCE) if(RunCMake_GENERATOR_INSTANCE)
set(_D_CMAKE_GENERATOR_INSTANCE "-DCMAKE_GENERATOR_INSTANCE=${RunCMake_GENERATOR_INSTANCE}") set(_D_CMAKE_GENERATOR_INSTANCE "-DCMAKE_GENERATOR_INSTANCE=${RunCMake_GENERATOR_INSTANCE}")
else() else()
@@ -134,6 +120,20 @@ function(run_cmake test)
${maybe_timeout} ${maybe_timeout}
${maybe_input_file} ${maybe_input_file}
) )
else()
if(NOT RunCMake_TEST_COMMAND_WORKING_DIRECTORY)
set(RunCMake_TEST_COMMAND_WORKING_DIRECTORY "${RunCMake_TEST_BINARY_DIR}")
endif()
execute_process(
COMMAND ${RunCMake_TEST_COMMAND}
WORKING_DIRECTORY "${RunCMake_TEST_COMMAND_WORKING_DIRECTORY}"
OUTPUT_VARIABLE actual_stdout
ERROR_VARIABLE ${actual_stderr_var}
RESULT_VARIABLE actual_result
ENCODING UTF8
${maybe_timeout}
${maybe_input_file}
)
endif() endif()
set(msg "") set(msg "")
if(NOT "${actual_result}" MATCHES "${expect_result}") if(NOT "${actual_result}" MATCHES "${expect_result}")