diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2010-05-11 13:30:41 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2010-05-11 13:30:41 (GMT) |
| commit | 2e25606a48f1867a5e328216b8f4a23f43ce329b (patch) | |
| tree | da10f3169ccf098e9e7ab52ec5f5e56dbebc244e | |
| parent | 83b00e00e2b6d3ffa5f752922b3da36372c5342f (diff) | |
| download | CMake-2e25606a48f1867a5e328216b8f4a23f43ce329b.zip CMake-2e25606a48f1867a5e328216b8f4a23f43ce329b.tar.gz CMake-2e25606a48f1867a5e328216b8f4a23f43ce329b.tar.bz2 | |
Disable purify on unix, as it works differently and ctest can't use it.
| -rw-r--r-- | Tests/CTestTest2/test.cmake.in | 8 | ||||
| -rw-r--r-- | Tests/CTestTest3/test.cmake.in | 8 |
2 files changed, 16 insertions, 0 deletions
diff --git a/Tests/CTestTest2/test.cmake.in b/Tests/CTestTest2/test.cmake.in index cccd8c1..f6ec198 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 1cf5a88..1e8ea50 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") |