Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Get rid of super specific gcovr version (maybe there was a reason?)
authordegomme <augustin.degomme@unibas.ch>
Mon, 1 Feb 2016 13:52:07 +0000 (14:52 +0100)
committerdegomme <augustin.degomme@unibas.ch>
Mon, 1 Feb 2016 13:52:07 +0000 (14:52 +0100)
tools/jenkins/DynamicAnalysis.sh

index 48e7696..55bab49 100755 (executable)
@@ -20,7 +20,7 @@ do_cleanup() {
 
 ### Check the node installation
 
-for pkg in xsltproc valgrind 
+for pkg in xsltproc valgrind gcovr
 do
    if dpkg -l |grep -q $pkg 
    then 
@@ -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"
@@ -83,7 +76,7 @@ ctest -D ExperimentalTest || true
 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