Merge branch 'master' of ssh://gsa1/humgen/gsa-scr1/gsa-engineering/git/unstable

This commit is contained in:
Matt Hanna 2012-01-24 15:32:26 -05:00
commit 4aacaf8916
1 changed files with 4 additions and 4 deletions

View File

@ -987,19 +987,19 @@
<property name="testng.classpath" value="testng.default.classpath" /> <property name="testng.classpath" value="testng.default.classpath" />
</target> </target>
<target name="alltests"> <target name="committests">
<antcall target="test" inheritAll="false"/> <antcall target="test" inheritAll="false"/>
<antcall target="integrationtest" inheritAll="false"/> <antcall target="integrationtest" inheritAll="false"/>
<antcall target="pipelinetest" inheritAll="false"/> <antcall target="pipelinetest" inheritAll="false"/>
</target> </target>
<target name="alltests.public"> <target name="committests.public">
<antcall target="test.public" inheritAll="false"/> <antcall target="test.public" inheritAll="false"/>
<antcall target="integrationtest.public" inheritAll="false"/> <antcall target="integrationtest.public" inheritAll="false"/>
<antcall target="pipelinetest.public" inheritAll="false"/> <antcall target="pipelinetest.public" inheritAll="false"/>
</target> </target>
<target name="alltests.gatk.packagejar" depends="init.buildpublic,package"> <target name="releasetests.gatk.packagejar" depends="init.buildpublic,package">
<antcall target="test.public" inheritAll="false"> <antcall target="test.public" inheritAll="false">
<param name="testng.classpath" value="testng.gatk.releasetest.classpath" /> <param name="testng.classpath" value="testng.gatk.releasetest.classpath" />
</antcall> </antcall>
@ -1008,7 +1008,7 @@
</antcall> </antcall>
</target> </target>
<target name="alltests.queue.packagejar" depends="init.buildpublic,queue"> <target name="releasetests.queue.packagejar" depends="init.buildpublic,queue">
<antcall target="package" inheritAll="false"> <antcall target="package" inheritAll="false">
<param name="executable" value="Queue" /> <param name="executable" value="Queue" />
</antcall> </antcall>