From: navarrop <navarrop@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Mon, 31 May 2010 12:14:28 +0000 (+0000)
Subject: Memcheck mode.
X-Git-Tag: v3_5~994
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/234ae403478cdecaa20912b4d549bc50919ccda9

Memcheck mode.

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

diff --git a/buildtools/Cmake/AddTests.cmake b/buildtools/Cmake/AddTests.cmake
index f78cad5066..6b090ad807 100644
--- a/buildtools/Cmake/AddTests.cmake
+++ b/buildtools/Cmake/AddTests.cmake
@@ -18,7 +18,7 @@ if(enable_memcheck)
 		endif(NEW_VALGRIND_VERSION)
 	else(VALGRIND_VERSION AND PERL_EXECUTABLE)
 		set(enable_memcheck false)
-		message("Command valgrind or perl not found --> enable_memcheck autoset to false.")
+		message(FATAL_ERROR "Command valgrind or perl not found --> enable_memcheck autoset to false.")
 	endif(VALGRIND_VERSION AND PERL_EXECUTABLE)
 endif(enable_memcheck)
 
diff --git a/buildtools/Cmake/CTestConfig.cmake b/buildtools/Cmake/CTestConfig.cmake
index b22809a1b1..062f187c2e 100644
--- a/buildtools/Cmake/CTestConfig.cmake
+++ b/buildtools/Cmake/CTestConfig.cmake
@@ -27,6 +27,10 @@ if(HAVE_TRACING)
 	SET(BUILDNAME "TRACING" CACHE TYPE INTERNAL FORCE)
 endif(HAVE_TRACING)
 
+if(HAVE_MC)
+	SET(BUILDNAME "MODEL-CHECKING" CACHE TYPE INTERNAL FORCE)
+endif(HAVE_MC)
+
 if(enable_memcheck)
 	SET(BUILDNAME "MEMCHECK" CACHE TYPE INTERNAL FORCE)
 endif(enable_memcheck)
diff --git a/buildtools/pipol/Experimental_all_simgrid_gt.sh b/buildtools/pipol/Experimental_all_simgrid_gt.sh
index 9ef07f478d..89eb9f0145 100644
--- a/buildtools/pipol/Experimental_all_simgrid_gt.sh
+++ b/buildtools/pipol/Experimental_all_simgrid_gt.sh
@@ -47,8 +47,18 @@ ctest -D ExperimentalCoverage
 ctest -D ExperimentalSubmit
 make clean
 
+#Make the model-checking mode
+cmake -Denable_model-checking=on ./
+ctest -D ExperimentalStart
+ctest -D ExperimentalConfigure
+ctest -D ExperimentalBuild
+ctest -D ExperimentalTest
+ctest -D ExperimentalCoverage
+ctest -D ExperimentalSubmit
+make clean
+
 #Make the full flags mode
-cmake -Denable_tracing=off -Denable_compile_warnings=on -Denable_compile_optimizations=on -Ddisable_lua=on -Ddisable_java=on -Ddisable_ruby=on ./
+cmake -Denable_model-checking=off -Denable_tracing=off -Denable_compile_warnings=on -Denable_compile_optimizations=on -Denable_lua=off -Denable_java=off -Denable_ruby=off ./
 ctest -D ExperimentalStart
 ctest -D ExperimentalConfigure
 ctest -D ExperimentalBuild
@@ -129,3 +139,12 @@ if [ $SYSTEM = Linux ] ; then
 		make clean
 	fi
 fi
+
+#Make the memcheck mode
+cmake -Denable_gtnets=off ./
+ctest -D ExperimentalStart
+ctest -D ExperimentalConfigure
+ctest -D ExperimentalBuild
+ctest -D ExperimentalMemCheck
+ctest -D ExperimentalSubmit
+make clean
\ No newline at end of file
diff --git a/buildtools/pipol/Nightly_simgrid.sh b/buildtools/pipol/Nightly_simgrid.sh
index fa5eef7846..4f37d2323b 100644
--- a/buildtools/pipol/Nightly_simgrid.sh
+++ b/buildtools/pipol/Nightly_simgrid.sh
@@ -68,8 +68,18 @@ ctest -D NightlyCoverage
 ctest -D NightlySubmit
 make clean
 
+#Make the model-checking mode
+cmake -Denable_model-checking=on ./
+ctest -D NightlyStart
+ctest -D NightlyConfigure
+ctest -D NightlyBuild
+ctest -D NightlyTest
+ctest -D NightlyCoverage
+ctest -D NightlySubmit
+make clean
+
 #Make the full flags mode
-cmake -Denable_tracing=off -Denable_compile_warnings=on -Denable_compile_optimizations=on -Ddisable_lua=on -Ddisable_java=on -Ddisable_ruby=on ./
+cmake -Denable_model-checking=off -Denable_tracing=off -Denable_compile_warnings=on -Denable_compile_optimizations=on -Denable_lua=off -Denable_java=off -Denable_ruby=off ./
 ctest -D NightlyStart
 ctest -D NightlyConfigure
 ctest -D NightlyBuild
@@ -137,7 +147,7 @@ if [ $SYSTEM = Linux ] ; then
 	cd $home_dir
 	rm -rf $absolute_path/GTNetS
 	cd simgrid-trunk
-
+	
 	if [ -e $userhome/usr/lib/libgtsim-opt.so ] ; then
 		#Make gtnets
 		cmake -Dsupernovae=off -Denable_compile_warnings=off -Denable_compile_optimizations=off -Dgtnets_path=$absolute_path/usr ./
@@ -150,3 +160,12 @@ if [ $SYSTEM = Linux ] ; then
 		make clean
 	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