diff options
| author | Zach Mullen <zach.mullen@kitware.com> | 2009-11-09 17:05:49 (GMT) |
|---|---|---|
| committer | Zach Mullen <zach.mullen@kitware.com> | 2009-11-09 17:05:49 (GMT) |
| commit | 8658fcbe24b96aa58deb6b1c498fe8229c486707 (patch) | |
| tree | 811f8132398ddba4ed526d03dd5cb48030cc660f | |
| parent | ef84e81011c66edfcc5223af0eff2790004d5689 (diff) | |
| download | CMake-8658fcbe24b96aa58deb6b1c498fe8229c486707.zip CMake-8658fcbe24b96aa58deb6b1c498fe8229c486707.tar.gz CMake-8658fcbe24b96aa58deb6b1c498fe8229c486707.tar.bz2 | |
Fix TRY_RUN cross compile test to pass consistently
| -rw-r--r-- | Tests/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Tests/CrossCompile/CMakeLists.txt | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index 4c54f5f..7552e78 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -135,6 +135,8 @@ IF(BUILD_TESTING) ADD_TEST_MACRO(Unset Unset) ADD_TEST_MACRO(PolicyScope PolicyScope) ADD_TEST_MACRO(CrossCompile CrossCompile) + SET_TESTS_PROPERTIES(CrossCompile PROPERTIES + PASS_REGULAR_EXPRESSION "TRY_RUN.. invoked in cross-compiling mode") IF("${CMAKE_TEST_GENERATOR}" MATCHES "Make") ADD_TEST_MACRO(Policy0002 Policy0002) ENDIF("${CMAKE_TEST_GENERATOR}" MATCHES "Make") diff --git a/Tests/CrossCompile/CMakeLists.txt b/Tests/CrossCompile/CMakeLists.txt index 9ef7a87..96a57a0 100644 --- a/Tests/CrossCompile/CMakeLists.txt +++ b/Tests/CrossCompile/CMakeLists.txt @@ -1,8 +1,9 @@ cmake_minimum_required (VERSION 2.6) PROJECT(CrossCompile) +UNSET(run_result CACHE) + #Simulate the cross compile condition -SET(CMAKE_SYSTEM_NAME "systemName") SET(CMAKE_CROSSCOMPILING ON) ADD_EXECUTABLE(CrossCompile main.c) |