diff options
| author | Jean-Christophe Fillion-Robin <jchris.fillionr@kitware.com> | 2016-05-03 02:48:21 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-05-03 14:42:21 (GMT) |
| commit | eccfc0d185526b746b722ed3d3d1302515698c9e (patch) | |
| tree | 62931f11c544a965d098c12cc6a2700e1c6d11e4 /Tests/RunCMake/CrosscompilingEmulator | |
| parent | 8de778118becd964310a4137e22baf9264c88627 (diff) | |
| download | CMake-eccfc0d185526b746b722ed3d3d1302515698c9e.zip CMake-eccfc0d185526b746b722ed3d3d1302515698c9e.tar.gz CMake-eccfc0d185526b746b722ed3d3d1302515698c9e.tar.bz2 | |
Tests: Improve source file name in RunCMake.CrosscompilingEmulator
The test executable returns with an error, so indicate this in the
source name.
Diffstat (limited to 'Tests/RunCMake/CrosscompilingEmulator')
| -rw-r--r-- | Tests/RunCMake/CrosscompilingEmulator/AddTest.cmake | 2 | ||||
| -rw-r--r-- | Tests/RunCMake/CrosscompilingEmulator/AddTest/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | Tests/RunCMake/CrosscompilingEmulator/CrosscompilingEmulatorProperty.cmake | 4 | ||||
| -rw-r--r-- | Tests/RunCMake/CrosscompilingEmulator/TryRun.cmake | 4 | ||||
| -rw-r--r-- | Tests/RunCMake/CrosscompilingEmulator/simple_src_exiterror.cxx (renamed from Tests/RunCMake/CrosscompilingEmulator/simple_src.cxx) | 0 |
5 files changed, 9 insertions, 7 deletions
diff --git a/Tests/RunCMake/CrosscompilingEmulator/AddTest.cmake b/Tests/RunCMake/CrosscompilingEmulator/AddTest.cmake index d304835..23e2e8d 100644 --- a/Tests/RunCMake/CrosscompilingEmulator/AddTest.cmake +++ b/Tests/RunCMake/CrosscompilingEmulator/AddTest.cmake @@ -3,7 +3,7 @@ enable_testing() add_test(NAME DoesNotUseEmulator 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 COMMAND generated_exe) diff --git a/Tests/RunCMake/CrosscompilingEmulator/AddTest/CMakeLists.txt b/Tests/RunCMake/CrosscompilingEmulator/AddTest/CMakeLists.txt index f3d11d5..025b54c 100644 --- a/Tests/RunCMake/CrosscompilingEmulator/AddTest/CMakeLists.txt +++ b/Tests/RunCMake/CrosscompilingEmulator/AddTest/CMakeLists.txt @@ -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) diff --git a/Tests/RunCMake/CrosscompilingEmulator/CrosscompilingEmulatorProperty.cmake b/Tests/RunCMake/CrosscompilingEmulator/CrosscompilingEmulatorProperty.cmake index 22d537c..1aeb510 100644 --- a/Tests/RunCMake/CrosscompilingEmulator/CrosscompilingEmulatorProperty.cmake +++ b/Tests/RunCMake/CrosscompilingEmulator/CrosscompilingEmulatorProperty.cmake @@ -3,7 +3,7 @@ # -DCMAKE_CROSSCOMPILING_EMULATOR=/path/to/pseudo_emulator is passed to this # 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 PROPERTY CROSSCOMPILING_EMULATOR) if(NOT "${emulator}" MATCHES "pseudo_emulator") @@ -20,7 +20,7 @@ if(NOT "${emulator}" MATCHES "another_emulator") endif() 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 PROPERTY CROSSCOMPILING_EMULATOR) if(NOT "${emulator}" STREQUAL "") diff --git a/Tests/RunCMake/CrosscompilingEmulator/TryRun.cmake b/Tests/RunCMake/CrosscompilingEmulator/TryRun.cmake index 4851cc7..af3712c 100644 --- a/Tests/RunCMake/CrosscompilingEmulator/TryRun.cmake +++ b/Tests/RunCMake/CrosscompilingEmulator/TryRun.cmake @@ -2,7 +2,7 @@ set(CMAKE_CROSSCOMPILING 1) try_run(run_result compile_result ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/simple_src.cxx + ${CMAKE_CURRENT_SOURCE_DIR}/simple_src_exiterror.cxx RUN_OUTPUT_VARIABLE run_output) message(STATUS "run_output: ${run_output}") @@ -13,6 +13,6 @@ set(CMAKE_CROSSCOMPILING_EMULATOR ${CMAKE_CROSSCOMPILING_EMULATOR} "multi arg") try_run(run_result compile_result ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/simple_src.cxx + ${CMAKE_CURRENT_SOURCE_DIR}/simple_src_exiterror.cxx RUN_OUTPUT_VARIABLE run_output) message(STATUS "Emulator with arguments run_output: ${run_output}") diff --git a/Tests/RunCMake/CrosscompilingEmulator/simple_src.cxx b/Tests/RunCMake/CrosscompilingEmulator/simple_src_exiterror.cxx index e5e94f2..e5e94f2 100644 --- a/Tests/RunCMake/CrosscompilingEmulator/simple_src.cxx +++ b/Tests/RunCMake/CrosscompilingEmulator/simple_src_exiterror.cxx |