From c7d473a7eb82396698d6652f111d9a2a583efea5 Mon Sep 17 00:00:00 2001
From: str4d <str4d@mail.i2p>
Date: Sat, 18 Feb 2012 02:13:46 +0000
Subject: [PATCH] Shuffle round mkdirs and deletes in router build.xml to match
core build.xml
batchtest has a todir config option that makes manual copying unnecessary.
---
router/java/build.xml | 26 +++++++-------------------
1 file changed, 7 insertions(+), 19 deletions(-)
diff --git a/router/java/build.xml b/router/java/build.xml
index 61592a8cf9..6f7081c2c2 100644
--- a/router/java/build.xml
+++ b/router/java/build.xml
@@ -101,6 +101,12 @@
<jar destfile="./build/routertest.jar" basedir="./build/obj" includes="**/*.class" />
</target>
<target name="test" depends="compileTest">
+ <mkdir dir="../../reports/router/junit/" />
+ <delete>
+ <fileset dir="../../reports/router/junit">
+ <include name="TEST-*.xml"/>
+ </fileset>
+ </delete>
<junit printsummary="on" fork="yes">
<classpath>
<pathelement path="${classpath}" />
@@ -109,31 +115,13 @@
<pathelement location="../../installer/lib/jbigi/jbigi.jar" />
<pathelement path="${ant.home}/lib/clover.jar"/>
</classpath>
- <batchtest>
+ <batchtest todir="../../reports/router/junit/">
<fileset dir="./test/">
<include name="**/*Test.java" />
</fileset>
</batchtest>
<formatter type="xml"/>
</junit>
- <mkdir dir="../../reports/" />
- <mkdir dir="../../reports/router/" />
- <mkdir dir="../../reports/router/junit/" />
- <delete>
- <fileset dir="../../reports/router/junit">
- <include name="TEST-*.xml"/>
- </fileset>
- </delete>
- <copy todir="../../reports/router/junit">
- <fileset dir=".">
- <include name="TEST-*.xml"/>
- </fileset>
- </copy>
- <delete>
- <fileset dir=".">
- <include name="TEST-*.xml"/>
- </fileset>
- </delete>
</target>
<target name="junit.report">
<junitreport todir="../../reports/router/junit">
--
GitLab