Swift
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile2
-rw-r--r--build.xml15
2 files changed, 15 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index e642806..b9c4d82 100644
--- a/Makefile
+++ b/Makefile
@@ -20,7 +20,7 @@ FINDBUGS_VERSION=3.0.1
20 20
21.PHONY : test 21.PHONY : test
22test: dist/lib/stroke.jar third-party/cobertura/cobertura.jar third-party/findbugs-$(FINDBUGS_VERSION)/lib/findbugs.jar third-party/pmd/lib/pmd-5.0.0.jar 22test: dist/lib/stroke.jar third-party/cobertura/cobertura.jar third-party/findbugs-$(FINDBUGS_VERSION)/lib/findbugs.jar third-party/pmd/lib/pmd-5.0.0.jar
23 ant ${DEFINES} -DJUNIT_JAR=${JUNIT} -Dcobertura-jar=third-party/cobertura/cobertura.jar -Djakarta-oro-jar=third-party/cobertura/lib/jakarta-oro-2.0.8.jar -Dlog4j-jar=third-party/cobertura/lib/log4j-1.2.9.jar -Dasm-jar=third-party/cobertura/lib/asm-3.0.jar -Dasm-tree-jar=third-party/cobertura/lib/asm-tree-3.0.jar -Dicu4j-jar=third-party/icu4j.jar -Dfindbugs.home=third-party/findbugs-$(FINDBUGS_VERSION) -Dpmd.home=third-party/pmd test 23 ant ${DEFINES} -DJUNIT_JAR=${JUNIT} -DHAMCREST_JAR=${HAMCREST} -Dcobertura-jar=third-party/cobertura/cobertura.jar -Djakarta-oro-jar=third-party/cobertura/lib/jakarta-oro-2.0.8.jar -Dlog4j-jar=third-party/cobertura/lib/log4j-1.2.9.jar -Dasm-jar=third-party/cobertura/lib/asm-3.0.jar -Dasm-tree-jar=third-party/cobertura/lib/asm-tree-3.0.jar -Dicu4j-jar=third-party/icu4j.jar -Dfindbugs.home=third-party/findbugs-$(FINDBUGS_VERSION) -Dpmd.home=third-party/pmd test
24 24
25third-party/aalto/aalto-xml.jar: 25third-party/aalto/aalto-xml.jar:
26 mkdir -p third-party/aalto 26 mkdir -p third-party/aalto
diff --git a/build.xml b/build.xml
index fe123bb..00f098e 100644
--- a/build.xml
+++ b/build.xml
@@ -117,6 +117,7 @@
117 <classpath> 117 <classpath>
118 <pathelement location="${jar}"/> 118 <pathelement location="${jar}"/>
119 <pathelement location="${JUNIT_JAR}"/> 119 <pathelement location="${JUNIT_JAR}"/>
120 <pathelement location="${HAMCREST_JAR}"/>
120 <fileset dir="${icu4j-dir}" includes="icu4j.jar"/> 121 <fileset dir="${icu4j-dir}" includes="icu4j.jar"/>
121 </classpath> 122 </classpath>
122 </javac> 123 </javac>
@@ -143,6 +144,7 @@
143 </classpath> 144 </classpath>
144 <classpath> 145 <classpath>
145 <pathelement location="${JUNIT_JAR}"/> 146 <pathelement location="${JUNIT_JAR}"/>
147 <pathelement location="${HAMCREST_JAR}"/>
146 <pathelement location="${jar}"/> 148 <pathelement location="${jar}"/>
147 <pathelement location="${src.tests}"/> 149 <pathelement location="${src.tests}"/>
148 <path refid="classpath"/> 150 <path refid="classpath"/>
@@ -201,7 +203,7 @@
201 </pmd> 203 </pmd>
202 </target> 204 </target>
203 205
204 <target name="test" depends="compile-tests, instrument, run-tests, coverage, findbugs, pmd"> 206 <target name="test" depends="compile-tests, instrument, run-tests, coverage, findbugs, pmd, report-junit-tests">
205 </target> 207 </target>
206 208
207 <target name="clean" 209 <target name="clean"
@@ -243,4 +245,15 @@
243 </classpath> 245 </classpath>
244 </java> 246 </java>
245 </target> 247 </target>
248
249 <target name="report-junit-tests" depends="run-tests">
250 <mkdir dir="${test.results}/html"/>
251 <junitreport todir="${test.results}">
252 <fileset dir="${test.results}">
253 <include name="TEST-*.xml"/>
254 </fileset>
255 <report todir="${test.results}/html"/>
256 </junitreport>
257 </target>
258
246</project> 259</project>