AfflictionNetworks/narya
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Made "ant tests" compile and run the tests not just compile them.

Browse Source 
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5557 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
Michael Bayne
2008-11-18 21:14:56 +00:00
parent 792a5142cd
commit 1a6e705f81
2 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build.xml
+8 -5
View File
@@ -266,16 +266,18 @@
</copy> </copy>
</target> </target>
<!-- builds the various tests --> <!-- runs our tests -->
<target name="tests"> <target name="tests">
<ant dir="tests" target="compile"/> <ant dir="tests" target="tests"/>
</target> </target>
<!-- a target for rebuilding everything --> <!-- a target for rebuilding everything -->
<target name="all" depends="clean,prepare,compile,aslib,ninstall,javadoc,tests,dist"/> <target name="all" depends="clean,prepare,compile,aslib,ninstall,javadoc,dist"/>
<!-- builds our distribution files (war and jar) --> <!-- builds our distribution files (war and jar) -->
<target name="dist" depends="prepare,compile,procstream,aslib,ninstall,tests"> <target name="dist" depends="prepare,compile,procstream,aslib,ninstall">
<!-- build our tests since that isn't otherwise normally done -->
<ant dir="tests" target="compile"/>
<!-- build our various jar files --> <!-- build our various jar files -->
<jar destfile="${deploy.dir}/${lib.name}-base.jar"> <jar destfile="${deploy.dir}/${lib.name}-base.jar">
<fileset dir="${classes.dir}" includes="com/threerings/NaryaLog**"/> <fileset dir="${classes.dir}" includes="com/threerings/NaryaLog**"/>
@@ -284,7 +286,8 @@
excludes="**/*.c,**/Makefile,**/*.h"/> excludes="**/*.c,**/Makefile,**/*.h"/>
</jar> </jar>
<jar destfile="${deploy.dir}/${lib.name}-distrib.jar"> <jar destfile="${deploy.dir}/${lib.name}-distrib.jar">
<fileset dir="${classes.dir}" includes="com/threerings/presents/**" excludes="**/*.html,**/*.png"/> <fileset dir="${classes.dir}" includes="com/threerings/presents/**"
excludes="**/*.html,**/*.png"/>
<fileset dir="${classes.dir}" includes="com/threerings/crowd/**"/> <fileset dir="${classes.dir}" includes="com/threerings/crowd/**"/>
<fileset dir="${classes.dir}" includes="com/threerings/admin/**"/> <fileset dir="${classes.dir}" includes="com/threerings/admin/**"/>
<fileset dir="${classes.dir}" includes="com/threerings/bureau/**"/> <fileset dir="${classes.dir}" includes="com/threerings/bureau/**"/>
tests/build.xml
+7 -8
View File
@@ -29,7 +29,7 @@
</path> </path>
<!-- generates additional methods for distributed object classes --> <!-- generates additional methods for distributed object classes -->
<target name="gendobj" depends="prepare"> <target name="gendobj" depends="prepare">
<taskdef name="dobj" <taskdef name="dobj"
classname="com.threerings.presents.tools.GenDObjectTask" classname="com.threerings.presents.tools.GenDObjectTask"
classpathref="classpath"/> classpathref="classpath"/>
@@ -47,7 +47,7 @@
<!-- generates marshaller and dispatcher classes for all invocation --> <!-- generates marshaller and dispatcher classes for all invocation -->
<!-- service declarations --> <!-- service declarations -->
<target name="genservice"> <target name="genservice">
<taskdef name="service" classpathref="classpath" <taskdef name="service" classpathref="classpath"
classname="com.threerings.presents.tools.GenServiceTask"/> classname="com.threerings.presents.tools.GenServiceTask"/>
<!-- make sure the service class files are all compiled --> <!-- make sure the service class files are all compiled -->
@@ -64,7 +64,7 @@
<!-- generates sender and decoder classes for all invocation --> <!-- generates sender and decoder classes for all invocation -->
<!-- receiver declarations --> <!-- receiver declarations -->
<target name="genreceiver"> <target name="genreceiver">
<taskdef name="receiver" classpathref="classpath" <taskdef name="receiver" classpathref="classpath"
classname="com.threerings.presents.tools.GenReceiverTask"/> classname="com.threerings.presents.tools.GenReceiverTask"/>
<!-- make sure the receiver class files are all compiled --> <!-- make sure the receiver class files are all compiled -->
@@ -121,7 +121,7 @@
</uptodate> </uptodate>
</and> </and>
</or></condition> </or></condition>
<available property="extdep.suffix" value="-0.0-SNAPSHOT" <available property="extdep.suffix" value="-0.0-SNAPSHOT"
filepath="../dist/lib" file="thane-0.0-SNAPSHOT.swc"/> filepath="../dist/lib" file="thane-0.0-SNAPSHOT.swc"/>
</target> </target>
@@ -162,9 +162,8 @@
</java> </java>
</target> </target>
<!-- run the tests --> <!-- run the tests -->
<target name="test" depends="compile" <target name="tests" depends="compile"
description="Run the tests."> description="Run the tests.">
<junit printsummary="no" haltonfailure="yes" fork="${junit.fork}"> <junit printsummary="no" haltonfailure="yes" fork="${junit.fork}">
<classpath refid="classpath"/> <classpath refid="classpath"/>
@@ -190,11 +189,11 @@
</target> </target>
<!-- builds the bureau thane test client --> <!-- builds the bureau thane test client -->
<target name="bureau-compile-thane-client" <target name="bureau-compile-thane-client"
unless="no_build_thane_client" depends="aslib,bureau-check-thane-client" unless="no_build_thane_client" depends="aslib,bureau-check-thane-client"
description="Compiles the thane client for testing the bureau library"> description="Compiles the thane client for testing the bureau library">
<dirname property="abs.flexsdk.dir" file="${flexsdk.dir}/somefile.txt"/> <dirname property="abs.flexsdk.dir" file="${flexsdk.dir}/somefile.txt"/>
<copy file="etc/thane-config.xml.in" tofile="${deploy.dir}/thane-config.xml"> <copy file="etc/thane-config.xml.in" tofile="${deploy.dir}/thane-config.xml">
<filterset> <filterset>
<filter token="flex_sdk_dir" value="${abs.flexsdk.dir}"/> <filter token="flex_sdk_dir" value="${abs.flexsdk.dir}"/>