From aa30bd3f2aa9b46b39738da60f9593175929cd46 Mon Sep 17 00:00:00 2001 From: Bill Hoffman Date: Tue, 11 May 2010 09:30:41 -0400 Subject: [PATCH] Disable purify on unix, as it works differently and ctest can't use it. --- Tests/CTestTest2/test.cmake.in | 8 ++++++++ Tests/CTestTest3/test.cmake.in | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/Tests/CTestTest2/test.cmake.in b/Tests/CTestTest2/test.cmake.in index cccd8c123..f6ec198af 100644 --- a/Tests/CTestTest2/test.cmake.in +++ b/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}) diff --git a/Tests/CTestTest3/test.cmake.in b/Tests/CTestTest3/test.cmake.in index 1cf5a885b..1e8ea5023 100644 --- a/Tests/CTestTest3/test.cmake.in +++ b/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:anoncvs@www.cmake.org:/cvsroot/KWSys\" co -r CTest-Testing-Tag KWSys")