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 062f187..66268f7 100644 (file)
--- 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 4f37d23..ebb624d 100644 (file)
--- 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