aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Schneider <asn@cynapses.org>2010-12-19 16:30:23 +0100
committerAndreas Schneider <asn@cynapses.org>2010-12-19 16:30:23 +0100
commitbcfab67daf09dda4aa71ea715ab999affdf67987 (patch)
tree0aa7736280a77613b9d47a4c62738103f78335f3
parent27f170011ee60b05fbcb44a95067cafa7843f6ec (diff)
downloadlibssh-bcfab67daf09dda4aa71ea715ab999affdf67987.tar.gz
libssh-bcfab67daf09dda4aa71ea715ab999affdf67987.tar.xz
libssh-bcfab67daf09dda4aa71ea715ab999affdf67987.zip
ctest: Set the memcheck suppression file correctly.
-rw-r--r--CTestConfig.cmake3
-rw-r--r--tests/ctest-default.cmake3
2 files changed, 3 insertions, 3 deletions
diff --git a/CTestConfig.cmake b/CTestConfig.cmake
index d7b414b3..d8a41831 100644
--- a/CTestConfig.cmake
+++ b/CTestConfig.cmake
@@ -1,8 +1,5 @@
set(UPDATE_TYPE "true")
-set(MEMORYCHECK_SUPPRESSIONS_FILE ${CMAKE_SOURCE_DIR}/tests/valgrind.supp)
-#set(CTEST_CUSTOM_MEMCHECK_IGNORE torture_rand)
-
set(CTEST_PROJECT_NAME "libssh")
set(CTEST_NIGHTLY_START_TIME "01:00:00 CET")
diff --git a/tests/ctest-default.cmake b/tests/ctest-default.cmake
index 76b17fbe..69c41568 100644
--- a/tests/ctest-default.cmake
+++ b/tests/ctest-default.cmake
@@ -7,11 +7,14 @@ 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_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")