X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4f23353a43b551cca580fbf043df1c38f5fb18d4..49637c6fbea1f5e16060fcceb844a637f50869ed:/tools/jenkins/DynamicAnalysis.sh

diff --git a/tools/jenkins/DynamicAnalysis.sh b/tools/jenkins/DynamicAnalysis.sh
index fbe85e3021..fae9f4062d 100755
--- 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 gcovr
+for pkg in valgrind
 do
-   if dpkg -l |grep -q $pkg 
+   if command -v $pkg
    then 
       echo "$pkg is installed. Good."
    else 
@@ -45,16 +45,16 @@ done
 cd $WORKSPACE/build
 
 ### Proceed with the tests
-ctest -D ExperimentalStart
+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
 
 ctest -D ExperimentalBuild -V
-ctest -D ExperimentalMemCheck
+ctest -D ExperimentalMemCheck || true
 
 cd $WORKSPACE/build
 if [ -f Testing/TAG ] ; then
@@ -62,21 +62,3 @@ if [ -f Testing/TAG ] ; then
    mv Testing/`head -n 1 < Testing/TAG`/DynamicAnalysis.xml  $WORKSPACE
 fi
 
-make clean
-ctest -D ExperimentalStart
-
-cmake -Denable_documentation=OFF -Denable_lua=ON -Denable_java=ON -Denable_tracing=ON \
-      -Denable_compile_optimizations=OFF -Denable_compile_warnings=ON \
-      -Denable_latency_bound_tracking=ON -Denable_jedule=ON -Denable_mallocators=ON \
-      -Denable_smpi=ON -Denable_smpi_MPICH3_testsuite=ON -Denable_model-checking=ON \
-      -Denable_memcheck=OFF -Denable_memcheck_xml=OFF -Denable_smpi_ISP_testsuite=ON -Denable_coverage=ON $WORKSPACE
-
-ctest -D ExperimentalBuild -V
-ctest -D ExperimentalTest
-ctest -D ExperimentalCoverage
-
-if [ -f Testing/TAG ] ; then
-   gcovr -r .. --xml-pretty -e teshsuite.* -u -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