diff --git a/deploy.xml b/deploy.xml index 637a6012adb35f9e7e8a1d027786adfce8dd9734..43a6a6142d479b220074d34d3beeb779d1fde556 100644 --- a/deploy.xml +++ b/deploy.xml @@ -9,7 +9,6 @@ Before executing check that all required modules/projects are enumerated in pro <description> Create a Jar file with RegionChooser libraries and executables </description> - <property name="deploy.dir.path" location="${user.home}/Desktop/SimStadt" /> <property name="target.path" value="lib/region-chooser" /> <property name="projects" value="RegionChooser,GeoLibs" /> <import file="../SimStadt/deploy-common.xml" /> @@ -29,15 +28,17 @@ java -classpath lib/* -Xms512m -Xmx2g -Djava.util.logging.config.file=logging.pr <chmod file="${deploy.dir}/RegionChooser.command" perm="u+x" /> </target> - <target name="unit-test" depends="test-common"> - <junit printsummary="yes" haltonfailure="yes"> + <target name="unit-test" depends="test-common" unless="doNotTest"> + <jacoco:coverage destfile="${reports.dir}/${ant.project.name}.exec" xmlns:jacoco="antlib:org.jacoco.ant"> + <junit printsummary="yes" haltonfailure="yes" fork="true"> - <classpath refid="test-classpath"/> - <formatter type="xml" usefile="true" /> - <formatter type="plain" usefile="true" /> + <classpath refid="test-classpath"/> + <formatter type="xml" usefile="true" /> + <formatter type="plain" usefile="true" /> - <!-- RegionExtractor --> - <test name="eu.simstadt.regionchooser.RegionExtractorTests" haltonfailure="no" todir="${reports.dir}"/> - </junit> + <!-- RegionExtractor --> + <test name="eu.simstadt.regionchooser.RegionExtractorTests" haltonfailure="no" todir="${reports.dir}"/> + </junit> + </jacoco:coverage> </target> </project> \ No newline at end of file