From 94a47045af31d08c93a9c50daf864bf436f1870c Mon Sep 17 00:00:00 2001
From: Chris Conlon <chris@wolfssl.com>
Date: Fri, 4 Dec 2015 11:51:07 -0700
Subject: [PATCH] easier uintegration of junit4 in build.xml

---
 build.xml | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/build.xml b/build.xml
index 699625c..17366b4 100644
--- a/build.xml
+++ b/build.xml
@@ -22,7 +22,12 @@
     <property name="examples.dir" value="examples/"/>
     <property name="examples.build.dir" value="examples/build"/>
     <property name="reports.dir" value="build/reports"/>
-    <property name="junit4" value="junit-4.11.jar" />
+
+    <!-- These paths should be relative to JUNIT_HOME -->
+    <property name="junit4" value="junit-4.12.jar" />
+    <property name="hamcrest-core" value="hamcrest-core-1.3.jar" />
+    <property name="ant-junit4" value="ant/ant-junit4.jar" />
+
     <property environment="env"/>
 
     <!-- classpath to compiled wolfssl.jar, for running tests -->
@@ -32,7 +37,6 @@
         </fileset>
         <fileset dir="${env.JUNIT_HOME}">
             <include name="${junit4}"/>
-            <include name="ant-junit4.jar"/>
         </fileset>
     </path>
 
@@ -139,11 +143,15 @@
     </target>
 
     <target name="test" depends="build-test">
-        <junit printsummary="yes" showoutput="yes" haltonfailure="yes">
+        <junit printsummary="yes" showoutput="yes" haltonfailure="yes" fork="true">
         <classpath>
             <pathelement location="${build.dir}"/>
             <pathelement location="${test.build.dir}"/>
-            <pathelement location="${java.class.path}"/>
+            <fileset dir="${env.JUNIT_HOME}">
+                <include name="${junit4}"/>
+                <include name="${hamcrest-core}"/>
+                <include name="${ant-junit4}"/>
+            </fileset>
         </classpath>
 
         <formatter type="plain"/>