Don't get tied to a version, this one needed an upgrade

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

diff --git a/tools/jenkins/Coverage.sh b/tools/jenkins/Coverage.sh
index 9fdf18e..b268cdb 100755 (executable)
--- a/tools/jenkins/Coverage.sh
+++ b/tools/jenkins/Coverage.sh
@@ -59,7 +59,8 @@ cmake -Denable_documentation=OFF -Denable_lua=ON -Denable_java=ON \
       -Denable_smpi_papi=ON \
       -Denable_memcheck=OFF -Denable_memcheck_xml=OFF -Denable_smpi_ISP_testsuite=ON -Denable_coverage=ON $WORKSPACE
 
-make -j$NUMPROC
+#build with sonarqube scanner wrapper
+/home/ci/build-wrapper-linux-x86/build-wrapper-linux-x86-64 --out-dir bw-outputs make -j$NUMPROC
 JACOCO_PATH="/usr/local/share/jacoco"
 export JAVA_TOOL_OPTIONS="-javaagent:${JACOCO_PATH}/lib/jacocoagent.jar"
 
@@ -69,7 +70,7 @@ ctest -D ExperimentalCoverage || true
 unset JAVA_TOOL_OPTIONS
 if [ -f Testing/TAG ] ; then
 
-  files=$( find . -name "jacoco.exec" )
+  files=$( find . -size +1c -name "jacoco.exec" )
   i=0
   for file in $files
   do
@@ -94,10 +95,11 @@ if [ -f Testing/TAG ] ; then
    then 
      for report in $WORKSPACE/java_cov*
      do
-       java -jar /home/ci/codacy-coverage-reporter-4.0.1-assembly.jar report -l Java -r $report --partial
+       if [ ! -e "$report" ]; then continue; fi
+       java -jar /home/ci/codacy-coverage-reporter-*-assembly.jar report -l Java -r $report --partial
      done
-     java -jar /home/ci/codacy-coverage-reporter-4.0.1-assembly.jar final
-     java -jar /home/ci/codacy-coverage-reporter-4.0.1-assembly.jar report -l C -f -r $WORKSPACE/xml_coverage.xml
-     java -jar /home/ci/codacy-coverage-reporter-4.0.1-assembly.jar report -l CPP -f -r $WORKSPACE/xml_coverage.xml
+     java -jar /home/ci/codacy-coverage-reporter-*-assembly.jar final
+     java -jar /home/ci/codacy-coverage-reporter-*-assembly.jar report -l C -f -r $WORKSPACE/xml_coverage.xml
+     java -jar /home/ci/codacy-coverage-reporter-*-assembly.jar report -l CPP -f -r $WORKSPACE/xml_coverage.xml
    fi
 fi