kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Tests: Improve source file name in RunCMake.CrosscompilingEmulator 

The test executable returns with an error, so indicate this in the
source name.
This commit is contained in:
Jean-Christophe Fillion-Robin 2016-05-02 22:48:21 -04:00 committed by Brad King
parent 8de778118b
commit eccfc0d185
5 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Tests/RunCMake/CrosscompilingEmulator/AddTest.cmake
View File

@ -3,7 +3,7 @@ enable_testing()
add_test(NAME DoesNotUseEmulator add_test(NAME DoesNotUseEmulator
COMMAND ${CMAKE_COMMAND} -E echo "Hi") COMMAND ${CMAKE_COMMAND} -E echo "Hi")
add_executable(generated_exe simple_src.cxx) add_executable(generated_exe simple_src_exiterror.cxx)
add_test(NAME UsesEmulator add_test(NAME UsesEmulator
COMMAND generated_exe) COMMAND generated_exe)

6
Tests/RunCMake/CrosscompilingEmulator/AddTest/CMakeLists.txt
View File

@ -1,3 +1,5 @@
add_executable(generated_exe_in_subdir_added_to_test_without_genex ${CMAKE_CURRENT_SOURCE_DIR}/../simple_src.cxx) add_executable(generated_exe_in_subdir_added_to_test_without_genex
${CMAKE_CURRENT_SOURCE_DIR}/../simple_src_exiterror.cxx)
add_executable(generated_exe_in_subdir_added_to_test_with_genex ${CMAKE_CURRENT_SOURCE_DIR}/../simple_src.cxx) add_executable(generated_exe_in_subdir_added_to_test_with_genex
${CMAKE_CURRENT_SOURCE_DIR}/../simple_src_exiterror.cxx)

4
Tests/RunCMake/CrosscompilingEmulator/CrosscompilingEmulatorProperty.cmake
View File

@ -3,7 +3,7 @@
# -DCMAKE_CROSSCOMPILING_EMULATOR=/path/to/pseudo_emulator is passed to this # -DCMAKE_CROSSCOMPILING_EMULATOR=/path/to/pseudo_emulator is passed to this
# test # test
add_executable(target_with_emulator simple_src.cxx) add_executable(target_with_emulator simple_src_exiterror.cxx)
get_property(emulator TARGET target_with_emulator get_property(emulator TARGET target_with_emulator
PROPERTY CROSSCOMPILING_EMULATOR) PROPERTY CROSSCOMPILING_EMULATOR)
if(NOT "${emulator}" MATCHES "pseudo_emulator") if(NOT "${emulator}" MATCHES "pseudo_emulator")
@ -20,7 +20,7 @@ if(NOT "${emulator}" MATCHES "another_emulator")
endif() endif()
unset(CMAKE_CROSSCOMPILING_EMULATOR CACHE) unset(CMAKE_CROSSCOMPILING_EMULATOR CACHE)
add_executable(target_without_emulator simple_src.cxx) add_executable(target_without_emulator simple_src_exiterror.cxx)
get_property(emulator TARGET target_without_emulator get_property(emulator TARGET target_without_emulator
PROPERTY CROSSCOMPILING_EMULATOR) PROPERTY CROSSCOMPILING_EMULATOR)
if(NOT "${emulator}" STREQUAL "") if(NOT "${emulator}" STREQUAL "")

4
Tests/RunCMake/CrosscompilingEmulator/TryRun.cmake
View File

@ -2,7 +2,7 @@ set(CMAKE_CROSSCOMPILING 1)
try_run(run_result compile_result try_run(run_result compile_result
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/simple_src.cxx ${CMAKE_CURRENT_SOURCE_DIR}/simple_src_exiterror.cxx
RUN_OUTPUT_VARIABLE run_output) RUN_OUTPUT_VARIABLE run_output)
message(STATUS "run_output: ${run_output}") message(STATUS "run_output: ${run_output}")
@ -13,6 +13,6 @@ set(CMAKE_CROSSCOMPILING_EMULATOR ${CMAKE_CROSSCOMPILING_EMULATOR}
"multi arg") "multi arg")
try_run(run_result compile_result try_run(run_result compile_result
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/simple_src.cxx ${CMAKE_CURRENT_SOURCE_DIR}/simple_src_exiterror.cxx
RUN_OUTPUT_VARIABLE run_output) RUN_OUTPUT_VARIABLE run_output)
message(STATUS "Emulator with arguments run_output: ${run_output}") message(STATUS "Emulator with arguments run_output: ${run_output}")

0
Tests/RunCMake/CrosscompilingEmulator/simple_src.cxx → Tests/RunCMake/CrosscompilingEmulator/simple_src_exiterror.cxx
View File