zzh
/
gatk-3.8
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixing some problems with the binary release tests 

-Classpaths to test the release jars were being constructed prematurely,
 before all needed properties had been defined
-Added reportng as a TestNG dependency for testing purposes
This commit is contained in:
David Roazen 2012-05-29 16:11:17 -04:00
parent 2908fb77e0
commit 1fa88fd389
1 changed files with 38 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
build.xml
View File

@ -1051,6 +1051,7 @@
<include name="junit*.jar"/>
<include name="bsh*.jar"/>
<include name="snakeyaml*.jar"/>
<include name="reportng*.jar"/>
</fileset>
</path>
@ -1066,38 +1067,6 @@
<path refid="external.dependencies" />
</path>
<path id="gatk.binary.release.tests.classpath">
<path refid="testng.dependencies" />
<path>
<fileset dir="${package.output.dir}">
<include name="**/${executable}.jar" />
</fileset>
</path>
<pathelement location="${java.contracts.dir}" />
<pathelement location="${java.test.classes}" />
<pathelement location="${scala.test.classes}" />
<pathelement location="${scala.classes}" />
<path>
<fileset dir="${lib.dir}">
<include name="scala*.jar"/>
<include name="jna*.jar"/>
</fileset>
</path>
</path>
<path id="queue.binary.release.tests.classpath">
<path refid="testng.dependencies" />
<path>
<fileset dir="${package.output.dir}">
<include name="**/${executable}.jar" />
</fileset>
</path>
<pathelement location="${java.contracts.dir}" />
<pathelement location="${java.test.classes}" />
<pathelement location="${scala.test.classes}" />
</path>
<!-- Test targets -->
<target name="test.init.compile">
@ -1180,8 +1149,14 @@
</condition>
<mkdir dir="@{outputdir}"/>
<echo message="" />
<echo message="Test Classpath ID: ${testng.classpath}" />
<property name="test.classpath.display.string" refid="${testng.classpath}" />
<echo message="Test Classpath: ${test.classpath.display.string}" />
<echo message="" />
<echo message="Sting: Running @{testtype} test cases!"/>
<echo message="Test classpath: ${testng.classpath}"/>
<taskdef resource="testngtasks" classpath="${testng.jar}"/>
<testng outputDir="@{outputdir}"
classpathref="${testng.classpath}"
@ -1237,13 +1212,43 @@
</target>
<target name="init.testgatkjar">
<path id="gatk.binary.release.tests.classpath">
<path refid="testng.dependencies" />
<path>
<fileset dir="${package.output.dir}">
<include name="**/${executable}.jar" />
</fileset>
</path>
<pathelement location="${java.contracts.dir}" />
<pathelement location="${java.test.classes}" />
<pathelement location="${scala.test.classes}" />
<pathelement location="${scala.classes}" />
<path>
<fileset dir="${lib.dir}">
<include name="scala*.jar"/>
<include name="jna*.jar"/>
</fileset>
</path>
</path>
<property name="testng.classpath" value="gatk.binary.release.tests.classpath" />
</target>
<target name="init.testqueuejar">
<path id="queue.binary.release.tests.classpath">
<path refid="testng.dependencies" />
<path>
<fileset dir="${package.output.dir}">
<include name="**/${executable}.jar" />
</fileset>
</path>
<pathelement location="${java.contracts.dir}" />
<pathelement location="${java.test.classes}" />
<pathelement location="${scala.test.classes}" />
</path>
<property name="testng.classpath" value="queue.binary.release.tests.classpath" />
</target>
<target name="committests">
<antcall target="unittest" inheritAll="false"/>
<antcall target="integrationtest" inheritAll="false"/>