Browse Source

Fix TRY_RUN cross compile test to pass consistently

Zach Mullen 16 years ago
parent
commit
8658fcbe24
2 changed files with 4 additions and 1 deletions
  1. 2 0
      Tests/CMakeLists.txt
  2. 2 1
      Tests/CrossCompile/CMakeLists.txt

+ 2 - 0
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")

+ 2 - 1
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)