From 473d3e0b3a08ae89b12fc1b74b225e36fb45bd94 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Tue, 21 Dec 2010 14:43:14 +0100 Subject: ctest: Set the suppression file correctly. --- tests/ctest-default.cmake | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/ctest-default.cmake b/tests/ctest-default.cmake index 69c41568..56e6541d 100644 --- a/tests/ctest-default.cmake +++ b/tests/ctest-default.cmake @@ -7,17 +7,17 @@ set(CTEST_CMAKE_GENERATOR "Unix Makefiles") set(CTEST_BUILD_CONFIGURATION "Profiling") set(CTEST_BUILD_OPTIONS "-DWITH_TESTING=ON -DWITH_SSH1=ON -WITH_SFTP=ON -DWITH_SERVER=ON -DWITH_ZLIB=ON -DWITH_PCAP=ON -DWITH_GCRYPT=OFF") +set(CTEST_SOURCE_DIRECTORY "${CTEST_DIRECTORY}/${CTEST_BUILD_NAME}/source") +set(CTEST_BINARY_DIRECTORY "${CTEST_DIRECTORY}/${CTEST_BUILD_NAME}/build") + +set(CTEST_MEMORYCHECK_SUPPRESSIONS_FILE ${CMAKE_SOURCE_DIR}/tests/valgrind.supp) #set(CTEST_CUSTOM_MEMCHECK_IGNORE torture_rand) + set(WITH_MEMCHECK FALSE) set(WITH_COVERAGE FALSE) ####################################################################### -set(MEMORYCHECK_SUPPRESSIONS_FILE ${CMAKE_SOURCE_DIR}/tests/valgrind.supp) - -set(CTEST_SOURCE_DIRECTORY "${CTEST_DIRECTORY}/${CTEST_BUILD_NAME}/source") -set(CTEST_BINARY_DIRECTORY "${CTEST_DIRECTORY}/${CTEST_BUILD_NAME}/build") - ctest_empty_binary_directory(${CTEST_BINARY_DIRECTORY}) find_program(CTEST_GIT_COMMAND NAMES git) -- cgit