From 04f4488f55cd11017fe87873f42fba0b7ad7cd5c Mon Sep 17 00:00:00 2001
From: Michael Bayne <mdb@threerings.net>
Date: Mon, 5 Apr 2010 01:35:58 +0000
Subject: [PATCH] Make the "tests" target actually work (and run the tests).
 But we'll not run the tests on every "dist" build, we'll just stick with the
 current behavior of only compiling the tests (to make sure they don't rot).
 In a better world ooo-libs would have a testall target which runs the tests
 on all the projects it builds, so that we actually got the benefit of the few
 unit tests we have.

git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@909 ed5b42cb-e716-0410-a449-f6a68f950b19
---
 build.xml       | 13 ++++++++-----
 tests/build.xml | 13 ++++++-------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/build.xml b/build.xml
index 4218265d..2a258b9c 100644
--- a/build.xml
+++ b/build.xml
@@ -177,16 +177,19 @@
     </java>
   </target>
 
-  <!-- builds the various tests -->
-  <target name="tests">
-    <ant dir="tests" target="compile"/>
+  <target name="tcompile" description="Builds (but does not run) the tests.">
+    <ant dir="tests" target="compile" inheritAll="false"/>
+  </target>
+
+  <target name="tests" description="Builds and runs the tests.">
+    <ant dir="tests" target="tests" inheritAll="false"/>
   </target>
 
   <!-- a target for rebuilding everything -->
-  <target name="all" depends="clean,prepare,compile,ninstall,javadoc,tests,dist"/>
+  <target name="all" depends="clean,prepare,compile,ninstall,tests,javadoc,dist"/>
 
   <!-- builds our distribution files (war and jar) -->
-  <target name="dist" depends="prepare,compile,procstream,ninstall,aslib,tests">
+  <target name="dist" depends="prepare,compile,tcompile,procstream,ninstall,aslib">
     <!-- build our various jar files -->
     <jar destfile="${deploy.dir}/${lib.name}-rsrc.jar">
       <fileset dir="${classes.dir}" includes="com/threerings/resource/**"/>
diff --git a/tests/build.xml b/tests/build.xml
index 684bbdb3..2526568c 100644
--- a/tests/build.xml
+++ b/tests/build.xml
@@ -5,12 +5,12 @@
   <property name="junit.fork"     value="true"/>
 
   <!-- things you probably don't want to change -->
-  <property name="test.dir"   value="."/>
+  <property name="test.dir"   value="${basedir}"/>
   <property name="src.dir"    value="src/java"/>
   <property name="deploy.dir" value="dist"/>
 
-  <property name="cbundle.dir" value="rsrc/bundles/components"/>
-  <property name="tbundle.dir" value="rsrc/bundles/tiles"/>
+  <property name="cbundle.dir" value="${basedir}/rsrc/bundles/components"/>
+  <property name="tbundle.dir" value="${basedir}/rsrc/bundles/tiles"/>
 
   <!-- import some targets to check dependency availability -->
   <import file="../etc/depends-incl.xml"/>
@@ -143,12 +143,11 @@
       classname="com.threerings.miso.tile.tools.CompileFringeConfigurationTask"/>
     <conffringe
      tilesetmap="${tbundle.dir}/tilesets.map"
-     fringedef="rsrc/config/miso/tile/fringeconf.xml"
-     target="rsrc/config/miso/tile/fringeconf.dat"/>
+     fringedef="${basedir}/rsrc/config/miso/tile/fringeconf.xml"
+     target="${basedir}/rsrc/config/miso/tile/fringeconf.dat"/>
   </target>
 
-  <!-- run the tests -->
-  <target name="test" depends="compile,cbundles,tsbundles" description="Run the tests.">
+  <target name="tests" depends="compile,cbundles,tsbundles" description="Runs the tests.">
     <junit printsummary="no" haltonfailure="yes" fork="${junit.fork}">
       <classpath refid="classpath"/>
       <sysproperty key="test_dir" value="${test.dir}"/>