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

fixed the build 

git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@3143 348d0f76-0448-11de-a6fe-93d51630548a
This commit is contained in:
aaron 2010-04-09 13:03:31 +00:00
parent f1b1e70612
commit 75c1987a18
1 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
build.xml
View File

@ -310,7 +310,7 @@
<attribute name="testtype"/> <attribute name="testtype"/>
<sequential> <sequential>
<mkdir dir="${report}"/> <mkdir dir="${report}"/>
<echo message="Sting: Running test cases!"/> <echo message="Sting: Running @{testtype} test cases!"/>
<junit printsummary="yes" showoutput="yes" maxmemory="${test.maxmemory}" clonevm="yes" haltonfailure="${halt}" failureProperty="test.failure"> <junit printsummary="yes" showoutput="yes" maxmemory="${test.maxmemory}" clonevm="yes" haltonfailure="${halt}" failureProperty="test.failure">
<formatter type="${testOutput}" usefile="${usefile}" /> <formatter type="${testOutput}" usefile="${usefile}" />
<classpath> <classpath>
@ -322,7 +322,7 @@
<batchtest fork="yes" todir="${report}"> <batchtest fork="yes" todir="${report}">
<fileset dir="${test.classes}"> <fileset dir="${test.classes}">
<include name="**/${single}@{testtype}.class"/> <include name="**/@{testtype}.class"/>
<exclude name="**/BaseTest.class"/> <exclude name="**/BaseTest.class"/>
</fileset> </fileset>
</batchtest> </batchtest>
@ -334,31 +334,22 @@
<!-- our three different test conditions: Test, IntegrationTest, PerformanceTest --> <!-- our three different test conditions: Test, IntegrationTest, PerformanceTest -->
<target name="test" depends="test.compile" description="Run unit tests"> <target name="test" depends="test.compile" description="Run unit tests">
<condition property="ttype" value="*UnitTest" else=""> <condition property="ttype" value="*UnitTest" else="${single}">
<not><isset property="single"/></not>
</condition>
<condition property="single" value="">
<not><isset property="single"/></not> <not><isset property="single"/></not>
</condition> </condition>
<run-test testtype="${ttype}"/> <run-test testtype="${ttype}"/>
</target> </target>
<target name="integrationtest" depends="test.compile" description="Run unit tests"> <target name="integrationtest" depends="test.compile" description="Run unit tests">
<condition property="ttype" value="*IntegrationTest" else=""> <condition property="itype" value="*IntegrationTest" else="${single}">
<not><isset property="single"/></not> <not><isset property="single"/></not>
</condition> </condition>
<condition property="single" value=""> <run-test testtype="${itype}"/>
<not><isset property="single"/></not>
</condition>
<run-test testtype="${ttype}"/>
</target> </target>
<target name="performancetest" depends="test.compile" description="Run unit tests"> <target name="performancetest" depends="test.compile" description="Run unit tests">
<condition property="ttype" value="*PerformanceTest" else=""> <condition property="ptype" value="*PerformanceTest" else="${single}">
<not><isset property="single"/></not> <not><isset property="single"/></not>
</condition> </condition>
<condition property="single" value=""> <run-test testtype="${ptype}"/>
<not><isset property="single"/></not>
</condition>
<run-test testtype="${ttype}"/>
</target> </target>
<!-- ***************************************************************************** --> <!-- ***************************************************************************** -->