Skip to content

Commit

Permalink
- Added properties for JVM arguments this allows us to switch on/off …
Browse files Browse the repository at this point in the history 
…debugging and stdout via ant. This is useful as it can be seen from the run target debug had been commented out. The properties allow us to explicitly turn off debugging (on by default) - Used properties for junit-test, run-test and run targets - Added jarTestData as a required target before junit-test can be run

Change-Id: I7b94641a6893fa1e3ec1047a1a67b7291b03a6e2
Signed-off-by: Egon Willighagen <egonw@users.sourceforge.net>
  • Loading branch information
@johnmay @egonw
johnmay authored and egonw committed Sep 23, 2012
1 parent aed8a5d commit 913c796
Showing 1 changed file with 19 additions and 14 deletions.
33 changes: 19 additions & 14 deletions build.xml
View file
Expand Up @@ -35,6 +35,11 @@
<property name="arg3" value="" />
<property name="arg4" value="" />

<!-- jvm arguments -->
<property name="jvmarg.cdk.debugging" value="true"
description="print debug logging statements"/>
<property name="jvmarg.cdk.stdout" value="true"/>

<!-- jar file names for libraries used for compiling -->
<property name="javaccjar" value="javacc.jar" />
<property name="antcontribjar" value="ant-contrib-1.0b3.jar" />
Expand Down Expand Up @@ -1124,7 +1129,8 @@
-Dtestclass=&lt;class>.">
<echo message="Running test class: testclass=${testclass}"/>
<java classname="org.openscience.cdk.${testclass}" fork="yes" maxmemory="512m">
<jvmarg value="-Dcdk.debugging=true"/>
<jvmarg value="-Dcdk.debugging=${jvmarg.cdk.debugging}"/>
<jvmarg value="-Dcdk.debug.stdout=${jvmarg.cdk.stdout}"/>
<classpath>
<fileset dir="${dist}/jar/">
<include name="*.jar" />
Expand All @@ -1139,12 +1145,12 @@
</java>
</target>

<target id="junit-test" name="junit-test" depends="dist-all,test-dist-all,noJunit"
<target id="junit-test" name="junit-test" depends="dist-all,jarTestdata,test-dist-all,noJunit"
description="Runs one specific JUnit test suite (org.openscience.cdk.&lt;class>) with -Dtestclass=&lt;class>.">
<echo message="JUnit tests class: testclass=${testclass}"/>
<junit printsummary="yes" haltonfailure="no" fork="yes">
<jvmarg value="-Dcdk.debugging=true"/>
<jvmarg value="-Dcdk.debug.stdout=true"/>
<echo message="JUnit tests class: testclass=${testclass} [JVM Arguments: cdk.debugging=${cdk.debugging}, ${jvmarg.cdk.stdout}]"/>
<junit printsummary="yes" haltonfailure="no" fork="yes" maxmemory="512m">
<jvmarg value="-Dcdk.debugging=${jvmarg.cdk.debugging}"/>
<jvmarg value="-Dcdk.debug.stdout=${jvmarg.cdk.stdout}"/>
<classpath>
<fileset dir="${dist}/jar/">
<include name="*.jar" />
Expand All @@ -1170,14 +1176,13 @@
<target id="run" name="run" depends="dist-all"
description="Runs an application (org.openscience.cdk.&lt;class>) with -Drunclass=&lt;class>.">
<java classname="org.openscience.cdk.${runclass}" fork="yes" >
<!--jvmarg value="-Dcdk.debugging=true"/>
<jvmarg value="-Dcdk.debug.stdout=true"/-->

<arg value="${arg1}" />
<arg value="${arg2}" />
<arg value="${arg3}" />
<arg value="${arg4}" />
<classpath>
<jvmarg value="-Dcdk.debugging=${jvmarg.cdk.debugging}"/>
<jvmarg value="-Dcdk.debug.stdout=${jvmarg.cdk.stdout}"/>
<arg value="${arg1}" />
<arg value="${arg2}" />
<arg value="${arg3}" />
<arg value="${arg4}" />
<classpath>
<fileset dir="${dist}/jar">
<include name="*.jar" />
</fileset>
Expand Down

0 comments on commit 913c796

Please sign in to comment.