Get rid of super specific gcovr version (maybe there was a reason?)

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

diff --git a/tools/jenkins/DynamicAnalysis.sh b/tools/jenkins/DynamicAnalysis.sh
index 48e7696..55bab49 100755 (executable)
--- a/tools/jenkins/DynamicAnalysis.sh
+++ b/tools/jenkins/DynamicAnalysis.sh
@@ -20,7 +20,7 @@ do_cleanup() {
 
 ### Check the node installation
 
 
 ### Check the node installation
 

-for pkg in xsltproc valgrind 
+for pkg in xsltproc valgrind gcovr

 do
    if dpkg -l |grep -q $pkg 
    then 
 do
    if dpkg -l |grep -q $pkg 
    then 


@@ -30,13 +30,6 @@ do
    fi
 done
 
    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"
 ### Cleanup previous runs
 
 ! [ -z "$WORKSPACE" ] || die "No WORKSPACE"


@@ -83,7 +76,7 @@ ctest -D ExperimentalTest || true
 ctest -D ExperimentalCoverage || true
 
 if [ -f Testing/TAG ] ; then
 ctest -D ExperimentalCoverage || true
 
 if [ -f Testing/TAG ] ; then

-   /usr/local/gcovr-3.1/scripts/gcovr -r .. --xml-pretty -e teshsuite.* -u -o $WORKSPACE/xml_coverage.xml
+   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
    xsltproc $WORKSPACE/tools/jenkins/ctest2junit.xsl Testing/`head -n 1 < Testing/TAG`/Test.xml > CTestResults_memcheck.xml
    mv CTestResults_memcheck.xml $WORKSPACE
 fi