X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1de2cea69ed077bfc9b387814f95dc35db3083dc..b9625f82f86db0674e911887addce45dca31b57f:/tools/jenkins/DynamicAnalysis.sh

diff --git a/tools/jenkins/DynamicAnalysis.sh b/tools/jenkins/DynamicAnalysis.sh
index b0f3b59179..f3e2930c0a 100755
--- a/tools/jenkins/DynamicAnalysis.sh
+++ b/tools/jenkins/DynamicAnalysis.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env sh
 
 set -e
 
@@ -7,89 +7,62 @@ die() {
     exit 1
 }
 
-do_cleanup() {
-  for d in "$WORKSPACE/build" "$WORKSPACE/memcheck"
+### Check the node installation
+
+pkg_check() {
+  for pkg
   do
-    if [ -d "$d" ]
+    if command -v "$pkg"
     then
-      rm -rf "$d" || die "Could not remote $d"
+       echo "$pkg is installed. Good."
+    else
+       die "please install $pkg before proceeding"
     fi
   done
-  find $WORKSPACE -name "memcheck_test_*.memcheck" -exec rm {} \;
 }
 
-### Check the node installation
+pkg_check valgrind pcregrep
 
-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
 
-### Cleanup previous runs
-
-! [ -z "$WORKSPACE" ] || die "No WORKSPACE"
+[ -n "$WORKSPACE" ] || die "No WORKSPACE"
 [ -d "$WORKSPACE" ] || die "WORKSPACE ($WORKSPACE) does not exist"
 
-do_cleanup
-
-for d in "$WORKSPACE/build" "$WORKSPACE/memcheck"
-do
-  mkdir "$d" || die "Could not create $d"
-done
+do_cleanup() {
+  for d
+  do
+    if [ -d "$d" ]
+    then
+      rm -rf "$d" || die "Could not remove $d"
+    fi
+    mkdir "$d" || die "Could not create $d"
+  done
+  find "$WORKSPACE" -name "memcheck_test_*.memcheck" -exec rm {} \;
+}
 
-cd $WORKSPACE/build
+do_cleanup "$WORKSPACE/build" "$WORKSPACE/memcheck"
 
-### Proceed with the tests
+NUMPROC="$(nproc)" || NUMPROC=1
 
-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
+cd "$WORKSPACE"/build
 
+### Proceed with the tests
 ctest -D ExperimentalStart || true
-ctest -D ExperimentalConfigure || true
-ctest -D ExperimentalBuild || true
-ctest -D ExperimentalMemCheck || true
 
-cd $WORKSPACE/build
-if [ -f Testing/TAG ] ; then
-   find . -iname "*.memcheck" -exec mv {} $WORKSPACE/memcheck \;
-   mv Testing/`head -n 1 < Testing/TAG`/DynamicAnalysis.xml  $WORKSPACE
-fi
+cmake -Denable_documentation=OFF -Denable_lua=OFF -Denable_python=OFF \
+      -Denable_compile_optimizations=OFF -Denable_compile_warnings=ON \
+      -Denable_jedule=OFF -Denable_mallocators=OFF \
+      -Denable_smpi=ON -Denable_smpi_MPICH3_testsuite=OFF -Denable_model-checking=OFF \
+      -Denable_memcheck_xml=ON -DLTO_EXTRA_FLAG="auto" "$WORKSPACE"
 
-make clean
 
-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
-ctest -D ExperimentalConfigure || true
-ctest -D ExperimentalBuild || true
-ctest -D ExperimentalTest || true
-ctest -D ExperimentalCoverage || true
+make -j$NUMPROC tests
+ctest --no-compress-output -D ExperimentalTest -j$NUMPROC || true
 
+cd "$WORKSPACE"/build
 if [ -f Testing/TAG ] ; then
-   /usr/local/gcovr-3.1/scripts/gcovr -r .. --xml-pretty -o $WORKSPACE/xml_coverage.xml
-   xsltproc $WORKSPACE/buildtools/jenkins/ctest2junit.xsl Testing/`head -n 1 < Testing/TAG`/Test.xml > CTestResults_memcheck.xml
-   mv CTestResults_memcheck.xml $WORKSPACE
+   find "$WORKSPACE" -iname "*.memcheck" -exec mv {} "$WORKSPACE"/memcheck \;
+   #remove all "empty" files
+   grep -r -L "error>" "$WORKSPACE"/memcheck | xargs rm -f
+   mv Testing/"$(head -n 1 < Testing/TAG)"/Test.xml  "$WORKSPACE"/DynamicAnalysis.xml
 fi
-
-do_cleanup