Browse Source

Disable purify on unix, as it works differently and ctest can't use it.

Bill Hoffman 15 years ago
parent
commit
aa30bd3f2a
2 changed files with 16 additions and 0 deletions
  1. 8 0
      Tests/CTestTest2/test.cmake.in
  2. 8 0
      Tests/CTestTest3/test.cmake.in

+ 8 - 0
Tests/CTestTest2/test.cmake.in

@@ -15,6 +15,14 @@ SET(CTEST_MEMORYCHECK_SUPPRESSIONS_FILE "@MEMORYCHECK_SUPPRESSIONS_FILE@")
 SET(CTEST_MEMORYCHECK_COMMAND_OPTIONS   "@MEMORYCHECK_COMMAND_OPTIONS@")
 SET(CTEST_COVERAGE_COMMAND              "@COVERAGE_COMMAND@")
 SET(CTEST_NOTES_FILES                   "${CTEST_SCRIPT_DIRECTORY}/${CTEST_SCRIPT_NAME}")
+# for unix purify has to be used as a linker, and
+# will not work with ctest.  So disable it so
+# that it is not attempted.
+IF(UNIX)
+  IF("${CTEST_MEMORYCHECK_COMMAND}" MATCHES purify)
+    SET(CTEST_MEMORYCHECK_COMMAND)
+  ENDIF()
+ENDIF()
 
 #CTEST_EMPTY_BINARY_DIRECTORY(${CTEST_BINARY_DIRECTORY})
 

+ 8 - 0
Tests/CTestTest3/test.cmake.in

@@ -25,6 +25,14 @@ SET(CTEST_BUILD_CONFIGURATION           "$ENV{CMAKE_CONFIG_TYPE}")
 SET(CTEST_MEMORYCHECK_COMMAND           "@MEMORYCHECK_COMMAND@")
 SET(CTEST_MEMORYCHECK_SUPPRESSIONS_FILE "@MEMORYCHECK_SUPPRESSIONS_FILE@")
 SET(CTEST_MEMORYCHECK_COMMAND_OPTIONS   "@MEMORYCHECK_COMMAND_OPTIONS@")
+# for unix purify has to be used as a linker, and
+# will not work with ctest.  So disable it so
+# that it is not attempted.
+IF(UNIX)
+  IF("${CTEST_MEMORYCHECK_COMMAND}" MATCHES purify)
+    SET(CTEST_MEMORYCHECK_COMMAND)
+  ENDIF()
+ENDIF()
 SET(CTEST_COVERAGE_COMMAND              "@COVERAGE_COMMAND@")
 SET(CTEST_NOTES_FILES                   "${CTEST_SCRIPT_DIRECTORY}/${CTEST_SCRIPT_NAME}")
 SET(CTEST_CHECKOUT_COMMAND              "\"${CTEST_UPDATE_COMMAND}\" -q -z3 \"-d:pserver:[email protected]:/cvsroot/KWSys\" co -r CTest-Testing-Tag KWSys")