Poke around trying to get jenkins to display files in src/bindings/java

diff --git a/tools/jenkins/Coverage.sh b/tools/jenkins/Coverage.sh
index a0f0149..1befd18 100755 (executable)
--- 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 a6a84e8..3d504c3 100644 (file)
--- a/tools/jenkins/jacoco.xml
+++ b/tools/jenkins/jacoco.xml
@@ -17,7 +17,6 @@
         </classfiles>
         <sourcefiles encoding="UTF-8">
             <fileset dir="${examplesrcdir}"/>
-            <fileset dir="${simgridsrcdir}"/>
         </sourcefiles>
     </structure>