cosmetics in the uglyness that MSVC requires

[simgrid.git] / buildtools / jenkins / run_DynamicAnalysis.sh

diff --git a/buildtools/jenkins/run_DynamicAnalysis.sh b/buildtools/jenkins/run_DynamicAnalysis.sh
index 3a65693..b0f3b59 100755 (executable)
--- a/buildtools/jenkins/run_DynamicAnalysis.sh
+++ b/buildtools/jenkins/run_DynamicAnalysis.sh
@@ -18,6 +18,27 @@ do_cleanup() {
   find $WORKSPACE -name "memcheck_test_*.memcheck" -exec rm {} \;
 }
 
+### Check the node installation
+
+for pkg in xsltproc valgrind 
+do
+   if dpkg -l |grep -q $pkg 
+   then 
+      echo "$pkg is installed. Good."
+   else 
+      die "please install $pkg before proceeding" 
+   fi
+done
+
+if [ -e /usr/local/gcovr-3.1/scripts/gcovr ] 
+then
+  echo "gcovr is installed, good."
+else
+  die "Please install /usr/local/gcovr-3.1/scripts/gcovr"
+fi
+
+### Cleanup previous runs
+
 ! [ -z "$WORKSPACE" ] || die "No WORKSPACE"
 [ -d "$WORKSPACE" ] || die "WORKSPACE ($WORKSPACE) does not exist"
 
@@ -30,7 +51,13 @@ done
 
 cd $WORKSPACE/build
 
-cmake -Denable_documentation=OFF -Denable_lua=OFF -Denable_tracing=ON -Denable_smpi=ON  -Denable_smpi_MPICH3_testsuite=OFF -Denable_compile_optimizations=OFF -Denable_compile_warnings=ON -Denable_lib_static=OFF -Denable_model-checking=OFF -Denable_latency_bound_tracking=OFF -Denable_gtnets=OFF -Denable_jedule=OFF -Denable_mallocators=OFF -Denable_memcheck_xml=ON $WORKSPACE
+### Proceed with the tests
+
+cmake -Denable_documentation=OFF -Denable_lua=OFF -Denable_tracing=ON \
+      -Denable_compile_optimizations=OFF -Denable_compile_warnings=ON -Denable_lib_static=OFF \
+      -Denable_latency_bound_tracking=OFF -Denable_jedule=OFF -Denable_mallocators=OFF \
+      -Denable_smpi=ON -Denable_smpi_MPICH3_testsuite=OFF -Denable_model-checking=OFF \
+      -Denable_memcheck_xml=ON $WORKSPACE
 make
 
 ctest -D ExperimentalStart || true
@@ -46,7 +73,11 @@ fi
 
 make clean
 
-cmake -Denable_documentation=OFF -Denable_lua=OFF -Denable_tracing=ON -Denable_smpi=ON -Denable_smpi_MPICH3_testsuite=ON -Denable_compile_optimizations=OFF -Denable_compile_warnings=ON -Denable_lib_static=OFF -Denable_model-checking=OFF -Denable_latency_bound_tracking=OFF -Denable_gtnets=OFF -Denable_jedule=OFF -Denable_mallocators=OFF -Denable_memcheck=OFF -Denable_memcheck_xml=OFF -Denable_coverage=ON $WORKSPACE
+cmake -Denable_documentation=OFF -Denable_lua=OFF -Denable_tracing=ON \
+      -Denable_compile_optimizations=OFF -Denable_compile_warnings=ON -Denable_lib_static=OFF \
+      -Denable_latency_bound_tracking=OFF -Denable_jedule=OFF -Denable_mallocators=OFF \
+      -Denable_smpi=ON -Denable_smpi_MPICH3_testsuite=OFF -Denable_model-checking=OFF  \
+      -Denable_memcheck=OFF -Denable_memcheck_xml=OFF -Denable_coverage=ON $WORKSPACE
 
 make
 ctest -D ExperimentalStart || true