new target ot-junit-otdt
versions for an intermediate IBuild
diff --git a/releng/build-scripts/build/run.xml b/releng/build-scripts/build/run.xml
index 1aa3c3f..2d90488 100644
--- a/releng/build-scripts/build/run.xml
+++ b/releng/build-scripts/build/run.xml
@@ -96,6 +96,7 @@
<target name="INFO">
<echo>Usage:
ant -f run.xml ot-junit-all -> runs OTDT Build and Testprocess
+ ant -f run.xml ot-junit-otdt -> runs OTDT Build and Testprocess excluding jdt tests
ant -f run.xml ot-junit-build -> runs just OTDT Buildprocess
ant -f run.xml ot-junit-run -> runs just OTDT Tests w/o TestSetup
</echo>
@@ -108,6 +109,13 @@
<antcall target="runAllTests"/>
</target>
+ <target name="ot-junit-otdt" depends="setupProperties,checkOS" description="Build all and run otdt tests.">
+ <echo message="Starting BuildProcess and Testrun in ${build.root.dir}"/>
+ <antcall target="verifyAntInstall"/>
+ <antcall target="setupTests" />
+ <antcall target="runOTDTTests"/>
+ </target>
+
<target name="ot-junit-build" depends="setupProperties,checkOS" description="build everything without running tests">
<echo message="Starting BuildProcess in ${build.root.dir}"/>
<antcall target="verifyAntInstall"/>
@@ -334,6 +342,20 @@
</ant>
</target>
+ <target name="runOTDTTests" description="Delegate to the next level script to perform the actual testing.">
+ <ant antfile="${OTScriptDir}/test.xml" target="otdt-tests" dir="${build.root.dir}">
+ <property name="os" value="${os}" />
+ <property name="ws" value="${ws}" />
+ <property name="arch" value="${arch}" />
+ <property name="baseos" value="${os}" />
+ <property name="basews" value="${ws}" />
+ <property name="basearch" value="${arch}" />
+ <property name="otdtUpdatesDir" value="${otdtUpdatesDir}" />
+ <property name="testsUpdatesDirBase" value="${testsUpdatesDirBase}" />
+ <property name="vmargs" value="${vmargs}" />
+ </ant>
+ </target>
+
<!-- currently unused target name="collectResults">
<ant target="collect" antfile="${test.eclipseDir}/plugins/${org.eclipse.test}/library.xml" dir="${otresults}">
<property name="includes" value="org.*.xml"/>