From 1cfdbf7e3f86ab50d7c0104cf172bd74e59e3c22 Mon Sep 17 00:00:00 2001
From: soupwizard <soupwizard@gmail.com>
Date: Wed, 24 Apr 2013 18:22:27 -0700
Subject: [PATCH] Added a build target "unittest-no-junit-report" to run unit
 tests and not create a junit report, but instead to show test run results in
 the ant output stream. Modified .travis.yml to use unittest-no-junit-report
 instead of unittest, and to change directory to core before doing the build
 and unittest.

---
 .travis.yml    |  5 +++--
 core/build.xml | 31 +++++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 2c0dedd0a..bb0b5b3ad 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,5 +2,6 @@ language: java
 jdk:
   - oraclejdk7
 script:
- - "ant -buildfile core/build.xml clean checkascii build jar"
- - "ant -buildfile core/build.xml unittest"
+ - "cd core"
+ - "ant -buildfile build.xml clean checkascii build jar"
+ - "ant -buildfile build.xml unittest-no-junit-report"
diff --git a/core/build.xml b/core/build.xml
index 35e1f66ce..9b79cf566 100644
--- a/core/build.xml
+++ b/core/build.xml
@@ -299,5 +299,36 @@ ${nonascii}</fail>
 	Unit tests passed successfully.
 		</echo>
  	</target>
+
+	<!--  Unit test (show errors in output stream instead of junit report)  -->
+	<target name="unittest-no-junit-report" description="Execute unit tests, show report to output stream" depends="build">
+		<echo>Building unit tests</echo>
+		<mkdir dir="${build-test.dir}"/>
+		<javac debug="true" srcdir="${src-test.dir}" destdir="${build-test.dir}" classpathref="test-classpath"/>
+		
+		<echo>Running unit tests</echo>
+		<mkdir dir="${tmp.dir}/rawtestoutput"/>
+		<junit fork="yes" forkmode="once" printsummary="false" failureproperty="junit.failure">
+			<classpath>
+				<path refid="test-classpath"/>
+				<path location="${basedir}"/>
+			</classpath>
+			<batchtest todir="${tmp.dir}/rawtestoutput">
+				<fileset dir="${build-test.dir}">
+					<include name="**/Test*.class" />
+					<include name="**/*Test.class" />
+					<exclude name="**/*$*.class" />
+					<exclude name="Test.class" />
+				</fileset>
+				<!-- <formatter type="xml"/> -->
+                <formatter type="plain" usefile="false" />
+			</batchtest>
+		</junit>
+		<fail if="junit.failure" message="Unit test(s) failed.  See output above for failures."/>
+		<echo>
+	Unit tests passed successfully.
+		</echo>
+ 	</target>
+    
     
 </project>