From d7418c636138030fd21bdd4dedba84c24e95e60e Mon Sep 17 00:00:00 2001 From: degomme Date: Wed, 1 Mar 2017 16:46:42 +0100 Subject: [PATCH] Poke around trying to get jenkins to display files in src/bindings/java --- tools/jenkins/Coverage.sh | 4 ++-- tools/jenkins/jacoco.xml | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/tools/jenkins/Coverage.sh b/tools/jenkins/Coverage.sh index a0f0149ce7..1befd1815b 100755 --- a/tools/jenkins/Coverage.sh +++ b/tools/jenkins/Coverage.sh @@ -72,9 +72,9 @@ if [ -f Testing/TAG ] ; then do sourcepath=`dirname $file` #convert jacoco reports in xml ones - ant -f $WORKSPACE/tools/jenkins/jacoco.xml -Dexamplesrcdir=$WORKSPACE/${sourcepath} -Dsimgridsrcdir=$WORKSPACE/src/bindings/java -Dbuilddir=$BUILDFOLDER/${sourcepath} -Djarfile=$BUILDFOLDER/simgrid.jar -Djacocodir=${JACOCO_PATH}/lib + 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 $WORKSPACE > $WORKSPACE/java_coverage_${i}.xml + cover2cover.py $BUILDFOLDER/${sourcepath}/report.xml .. ../src/bindings/java src/bindings/java > $WORKSPACE/java_coverage_${i}.xml i=$(($i + 1)) done diff --git a/tools/jenkins/jacoco.xml b/tools/jenkins/jacoco.xml index a6a84e805e..3d504c353f 100644 --- a/tools/jenkins/jacoco.xml +++ b/tools/jenkins/jacoco.xml @@ -17,7 +17,6 @@ - -- 2.20.1