Attempt to have dynamicanalysis working again.

[simgrid.git] / tools / jenkins / DynamicAnalysis.sh

diff --git a/tools/jenkins/DynamicAnalysis.sh b/tools/jenkins/DynamicAnalysis.sh
index 0e50a6e..af4353d 100755 (executable)
--- a/tools/jenkins/DynamicAnalysis.sh
+++ b/tools/jenkins/DynamicAnalysis.sh
@@ -20,9 +20,9 @@ do_cleanup() {
 
 ### Check the node installation
 
-for pkg in xsltproc valgrind 
+for pkg in valgrind
 do
-   if dpkg -l |grep -q $pkg 
+   if command -v $pkg
    then 
       echo "$pkg is installed. Good."
    else 
@@ -30,13 +30,6 @@ do
    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"
@@ -52,18 +45,19 @@ done
 cd $WORKSPACE/build
 
 ### Proceed with the tests
+ctest -D ExperimentalStart || true
 
-cmake -Denable_documentation=OFF -Denable_lua=OFF -Denable_tracing=ON \
+cmake -Denable_documentation=OFF -Denable_lua=OFF  \
       -Denable_compile_optimizations=OFF -Denable_compile_warnings=ON \
-      -Denable_latency_bound_tracking=OFF -Denable_jedule=OFF -Denable_mallocators=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
-ctest -D ExperimentalConfigure || true
-ctest -D ExperimentalBuild || true
-ctest -D ExperimentalMemCheck || true
+ctest -D ExperimentalBuild -V
+ctest -D ExperimentalTest || true
+
+unset VALGRIND_COMMAND
+unset VALGRIND_COMMAND_OPTIONS
 
 cd $WORKSPACE/build
 if [ -f Testing/TAG ] ; then
@@ -71,25 +65,3 @@ if [ -f Testing/TAG ] ; then
    mv Testing/`head -n 1 < Testing/TAG`/DynamicAnalysis.xml  $WORKSPACE
 fi
 
-make clean
-
-cmake -Denable_documentation=OFF -Denable_lua=OFF -Denable_tracing=ON \
-      -Denable_compile_optimizations=OFF -Denable_compile_warnings=ON \
-      -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
-
-if [ -f Testing/TAG ] ; then
-   /usr/local/gcovr-3.1/scripts/gcovr -r .. --xml-pretty -o $WORKSPACE/xml_coverage.xml
-   xsltproc $WORKSPACE/tools/jenkins/ctest2junit.xsl Testing/`head -n 1 < Testing/TAG`/Test.xml > CTestResults_memcheck.xml
-   mv CTestResults_memcheck.xml $WORKSPACE
-fi
-
-do_cleanup