From 7efe9b0c854907fdef4081bd72336deec920a859 Mon Sep 17 00:00:00 2001
From: Sam Pottinger <samp@gleap.org>
Date: Mon, 25 Nov 2019 18:09:01 -0800
Subject: [PATCH] Removed test from the build / run targets but left in for
 dist.

Refactored ant build chain to allow building / running without execution of tests but ensure tests are run during dist. Note that tests are still runnable under the test target itself. Resolves #8.
---
 build/build.xml     | 10 ++++++++--
 build/jre/build.xml |  6 ++++--
 core/build.xml      |  4 ++--
 java/build.xml      |  4 ++--
 4 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/build/build.xml b/build/build.xml
index bdc07d600..d1d010635 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -354,7 +354,7 @@
 
   <target name="downloader-setup">
     <!-- make sure we're built -->
-    <subant buildpath="jre" target="dist" />
+    <subant buildpath="jre" target="dist-no-test" />
 
     <!-- define our special JRE downloader task -->
     <taskdef name="downloader"
@@ -482,7 +482,7 @@
     <antcall target="${target-platform}-run-app" />
   </target>
 
-  <target name="dist" depends="revision-check"
+  <target name="dist" depends="revision-check, test"
           description="Build Processing for distribution.">
     <input message="Enter version number:"
            addproperty="version"
@@ -526,6 +526,12 @@
     <delete dir="../java/examples" />
   </target>
 
+  <target name="test" depends="build">
+    <subant buildpath="../core" target="test"/>
+    <subant buildpath="../java" target="test"/>
+    <subant buildpath="jre" target="test" />
+  </target>
+
   <target name="subprojects-build">
     <subant buildpath="../core" target="build"/>
     <subant buildpath="../app" target="build"/>
diff --git a/build/jre/build.xml b/build/jre/build.xml
index 414cbb1f8..f39ed41a1 100644
--- a/build/jre/build.xml
+++ b/build/jre/build.xml
@@ -47,14 +47,16 @@
     </junit>
   </target>
 
-  <target name="compile" depends="test">
+  <target name="compile">
     <compilecommon srcdir="src" destdir="bin" classpath="classpath.base" />
   </target>
 
-  <target name="dist" depends="compile">
+  <target name="dist-no-test" depends="compile">
     <jar basedir="bin" destfile="downloader.jar" />
   </target>
 
+  <target name="dist" depends="test, dist-no-test" />
+
   <target name="demo" depends="dist">
     <taskdef name="downloader"
 	     classname="Downloader"
diff --git a/core/build.xml b/core/build.xml
index 6cd161376..c3e03aa1d 100644
--- a/core/build.xml
+++ b/core/build.xml
@@ -96,7 +96,7 @@
     <delete dir="resource-test/scratch" />
   </target>
 
-  <target name="test" depends="test-compile, clean-pre-test">
+  <target name="test" depends="build, test-compile, clean-pre-test">
     <junit haltonfailure="true">
       <classpath refid="classpath.test" />
       <formatter type="brief" usefile="false" />
@@ -108,7 +108,7 @@
     </junit>
   </target>
 
-  <target name="compile" description="Compile" depends="test">
+  <target name="compile" description="Compile">
     <compilecommon srcdir="src" destdir="bin" classpath="classpath.base" />
   </target>
 
diff --git a/java/build.xml b/java/build.xml
index a942695f7..ff397d21e 100644
--- a/java/build.xml
+++ b/java/build.xml
@@ -124,7 +124,7 @@
     <compilecommon srcdir="src; test/processing" destdir="bin-test" classpath="classpath.test" />
   </target>
 
-  <target name="test" depends="test-compile">
+  <target name="test" depends="build, test-compile">
     <junit haltonfailure="true">
       <classpath refid="classpath.test" />
       <formatter type="brief" usefile="false" />
@@ -137,7 +137,7 @@
     </junit>
   </target>
 
-  <target name="compile" depends="test" description="Compile sources">
+  <target name="compile" description="Compile sources" depends="preproc">
     <compilecommon srcdir="src" destdir="bin" classpath="classpath.base" />
   </target>