avoid mixing travis builders

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

diff --git a/tools/jenkins/Coverage.sh b/tools/jenkins/Coverage.sh
index fca49e6..c9bb23b 100755 (executable)
--- a/tools/jenkins/Coverage.sh
+++ b/tools/jenkins/Coverage.sh
@@ -62,11 +62,11 @@ cmake -Denable_documentation=OFF -Denable_lua=ON -Denable_java=ON \
       -Denable_memcheck=OFF -Denable_memcheck_xml=OFF -Denable_smpi_ISP_testsuite=ON -Denable_coverage=ON $WORKSPACE
 
 #build with sonarqube scanner wrapper
-/home/ci/build-wrapper-linux-x86/build-wrapper-linux-x86-64 --out-dir bw-outputs make -j$NUMPROC
+/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 --branch"
+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
@@ -84,24 +84,17 @@ if [ -f Testing/TAG ] ; then
     #convert jacoco xml reports in cobertura xml reports
     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
+    mv $BUILDFOLDER/${sourcepath}/report.xml $BUILDFOLDER/jacoco_cov_${i}.xml
     i=$((i + 1))
   done
 
-  cd $WORKSPACE
-
-  files=$( find . -size +1c -name ".coverage" )
-  i=0
-  for file in $files
-  do
-    sourcepath=$( dirname $file )
-    #convert python coverage reports in xml ones
-    cd $sourcepath
-    /usr/bin/python3-coverage xml -i -o $BUILDFOLDER/python_coverage_${i}.xml
-    cd $WORKSPACE
-    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 $BUILDFOLDER/xml_coverage.xml
    xsltproc $WORKSPACE/tools/jenkins/ctest2junit.xsl build/Testing/$( head -n 1 < build/Testing/TAG )/Test.xml > CTestResults_memcheck.xml
@@ -118,12 +111,8 @@ if [ -f Testing/TAG ] ; then
        java -jar /home/ci/codacy-coverage-reporter-*-assembly.jar report -l Java -r $report --partial
      done
      java -jar /home/ci/codacy-coverage-reporter-*-assembly.jar final
-     for report in $BUILDFOLDER/python_cov*
-     do
-       if [ ! -e "$report" ]; then continue; fi
-       java -jar /home/ci/codacy-coverage-reporter-*-assembly.jar report -l Python -r $report --partial
-     done
-     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