X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2697ad5f3ae4ab2c6e9370e0684bf3245ca50dd5..16673e04b393c2d8c031d0d77ec318ac2c711f4e:/tools/jenkins/Coverage.sh

diff --git a/tools/jenkins/Coverage.sh b/tools/jenkins/Coverage.sh
index 123bc2841d..80473cfbd3 100755
--- a/tools/jenkins/Coverage.sh
+++ b/tools/jenkins/Coverage.sh
@@ -48,6 +48,8 @@ NUMPROC="$(nproc)" || NUMPROC=1
 
 cd $BUILDFOLDER
 rm -rf java_cov*
+rm -rf jacoco_cov*
+rm -rf python_cov*
 rm -rf xml_coverage.xml
 
 ctest -D ExperimentalStart || true
@@ -59,10 +61,13 @@ 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 tests
 JACOCO_PATH="/usr/local/share/jacoco"
 export JAVA_TOOL_OPTIONS="-javaagent:${JACOCO_PATH}/lib/jacocoagent.jar"
 
+export PYTHON_TOOL_OPTIONS="/usr/bin/python3-coverage run --parallel-mode --branch"
+
 ctest --no-compress-output -D ExperimentalTest -j$NUMPROC || true
 ctest -D ExperimentalCoverage || true
 
@@ -77,13 +82,21 @@ if [ -f Testing/TAG ] ; then
     #convert jacoco reports in xml ones
     ant -f $WORKSPACE/tools/jenkins/jacoco.xml -Dexamplesrcdir=$WORKSPACE -Dbuilddir=$BUILDFOLDER/${sourcepath} -Djarfile=$BUILDFOLDER/simgrid.jar -Djacocodir=${JACOCO_PATH}/lib
     #convert jacoco xml reports in cobertura xml reports
-    cover2cover.py $BUILDFOLDER/${sourcepath}/report.xml .. ../src/bindings/java src/bindings/java > $WORKSPACE/java_coverage_${i}.xml
+    cover2cover.py $BUILDFOLDER/${sourcepath}/report.xml .. ../src/bindings/java src/bindings/java > $BUILDFOLDER/java_coverage_${i}.xml
+    #save jacoco xml report as sonar only allows it 
+    mv $BUILDFOLDER/${sourcepath}/report.xml $BUILDFOLDER/jacoco_coverage_${i}.xml
     i=$((i + 1))
   done
 
+  #convert python coverage reports in xml ones
+  cd $BUILDFOLDER
+  find .. -size +1c -name ".coverage*" -exec mv {} . \;
+  /usr/bin/python3-coverage combine
+  /usr/bin/python3-coverage xml -i -o ./python_coverage.xml
+
    cd $WORKSPACE
    #convert all gcov reports to xml cobertura reports
-   gcovr -r . --xml-pretty -e teshsuite -u -o $WORKSPACE/xml_coverage.xml
+   gcovr -r . --xml-pretty -e teshsuite -u -o $BUILDFOLDER/xml_coverage.xml
    xsltproc $WORKSPACE/tools/jenkins/ctest2junit.xsl build/Testing/$( head -n 1 < build/Testing/TAG )/Test.xml > CTestResults_memcheck.xml
 
    #generate sloccount report
@@ -92,12 +105,15 @@ if [ -f Testing/TAG ] ; then
    #upload files to codacy. CODACY_PROJECT_TOKEN must be setup !
    if ! [ -z $CODACY_PROJECT_TOKEN ]
    then 
-     for report in $WORKSPACE/java_cov*
+     for report in $BUILDFOLDER/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 Python -r $BUILDFOLDER/python_coverage.xml
+     java -jar /home/ci/codacy-coverage-reporter-*-assembly.jar report -l C -f -r $BUILDFOLDER/xml_coverage.xml
+     java -jar /home/ci/codacy-coverage-reporter-*-assembly.jar report -l CPP -f -r $BUILDFOLDER/xml_coverage.xml
    fi
 fi