From: navarrop <navarrop@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Mon, 31 May 2010 12:52:40 +0000 (+0000)
Subject: Memcheck timeout set to 300s.
X-Git-Tag: v3_5~993
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/7d56c617d07e090716bd4fc713a9cd09f2abd084

Memcheck timeout set to 300s.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@7815 48e7efb5-ca39-0410-a469-dd3cf9ba447f
---

diff --git a/buildtools/Cmake/CTestConfig.cmake b/buildtools/Cmake/CTestConfig.cmake
index 062f187c2e..66268f7f44 100644
--- a/buildtools/Cmake/CTestConfig.cmake
+++ b/buildtools/Cmake/CTestConfig.cmake
@@ -2,7 +2,9 @@
 # http://www.cmake.org/Wiki/CMake_Testing_With_CTest#Customizing_CTest
 
 SET(BUILDNAME "none" CACHE TYPE INTERNAL FORCE)
-
+if(enable_memcheck)
+	set(CTEST_TIMEOUT "300") #TIMEOUT FOR EACH TEST
+endif(enable_memcheck)
 if(with_context MATCHES ucontext AND NOT supernovae)
 	SET(BUILDNAME "UCONTEXT" CACHE TYPE INTERNAL FORCE)
 endif(with_context MATCHES ucontext AND NOT supernovae)
diff --git a/buildtools/pipol/Nightly_simgrid.sh b/buildtools/pipol/Nightly_simgrid.sh
index 4f37d2323b..ebb624daf1 100644
--- a/buildtools/pipol/Nightly_simgrid.sh
+++ b/buildtools/pipol/Nightly_simgrid.sh
@@ -161,11 +161,13 @@ if [ $SYSTEM = Linux ] ; then
 	fi
 fi
 
-#Make the memcheck mode
-cmake -Denable_gtnets=off ./
-ctest -D NightlyStart
-ctest -D NightlyConfigure
-ctest -D NightlyBuild
-ctest -D NightlyMemCheck
-ctest -D NightlySubmit
-make clean
\ No newline at end of file
+if( $PIPOL_IMAGE = i386-linux-ubuntu-karmic.dd.gz )
+	#Make the memcheck mode
+	cmake -Denable_gtnets=off ./
+	ctest -D NightlyStart
+	ctest -D NightlyConfigure
+	ctest -D NightlyBuild
+	ctest -D NightlyMemCheck
+	ctest -D NightlySubmit
+	make clean
+fi
\ No newline at end of file