Also simplify the way we handle java tests in coverage to avoid keeping a list of tests here.
+BUILDFOLDER=$WORKSPACE/build
+
die() {
echo "$@"
exit 1
}
do_cleanup() {
die() {
echo "$@"
exit 1
}
do_cleanup() {
- for d in "$WORKSPACE/build"
+ for d in "$BUILDFOLDER"
-for d in "$WORKSPACE/build"
do
mkdir "$d" || die "Could not create $d"
done
do
mkdir "$d" || die "Could not create $d"
done
NUMPROC="$(nproc)" || NUMPROC=1
NUMPROC="$(nproc)" || NUMPROC=1
ctest -D ExperimentalStart || true
ctest -D ExperimentalStart || true
ctest -D ExperimentalCoverage || true
unset JAVA_TOOL_OPTIONS
ctest -D ExperimentalCoverage || true
unset JAVA_TOOL_OPTIONS
if [ -f Testing/TAG ] ; then
if [ -f Testing/TAG ] ; then
- for example in app/bittorrent app/centralizedmutex app/masterworker app/pingpong app/tokenring async/yield async/waitall async/dsend cloud/migration cloud/masterworker dht/chord dht/kademlia energy/consumption energy/pstate energy/vm io/file io/storage process/kill process/migration process/startkilltime process/suspend task/priority trace/pingpong
+
+ files=`find . -name "jacoco.exec"`
+ i=0
+ for file in $files
+ sourcepath=`dirname $file`
#convert jacoco reports in xml ones
#convert jacoco reports in xml ones
- ant -f $WORKSPACE/tools/jenkins/jacoco.xml -Dsrcdir=$WORKSPACE/examples/java/${example} -Dbuilddir=$WORKSPACE/build/examples/java/${example} -Djacocodir=${JACOCO_PATH}/lib
+ 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
#convert jacoco xml reports in cobertura xml reports
#convert jacoco xml reports in cobertura xml reports
- cover2cover.py $WORKSPACE/build/examples/java/${example}/report.xml $WORKSPACE/examples/java/ > $WORKSPACE/java_coverage_${i}.xml
- i=$(($i + 1))
+ cover2cover.py $BUILDFOLDER/${sourcepath}/report.xml $WORKSPACE > $WORKSPACE/java_coverage_${i}.xml
+ i=$(($i + 1))
#convert all gcov reports to xml cobertura reports
gcovr -r .. --xml-pretty -e teshsuite.* -u -o $WORKSPACE/xml_coverage.xml
xsltproc $WORKSPACE/tools/jenkins/ctest2junit.xsl Testing/`head -n 1 < Testing/TAG`/Test.xml > CTestResults_memcheck.xml
#convert all gcov reports to xml cobertura reports
gcovr -r .. --xml-pretty -e teshsuite.* -u -o $WORKSPACE/xml_coverage.xml
xsltproc $WORKSPACE/tools/jenkins/ctest2junit.xsl Testing/`head -n 1 < Testing/TAG`/Test.xml > CTestResults_memcheck.xml
<structure name="Example Project">
<classfiles>
<fileset dir="${builddir}"/>
<structure name="Example Project">
<classfiles>
<fileset dir="${builddir}"/>
+ <fileset file="${jarfile}"/>
</classfiles>
<sourcefiles encoding="UTF-8">
</classfiles>
<sourcefiles encoding="UTF-8">
- <fileset dir="${srcdir}"/>
+ <fileset dir="${examplesrcdir}"/>
+ <fileset dir="${simgridsrcdir}"/>
</sourcefiles>
</structure>
</sourcefiles>
</structure>