new target ot-junit-otdt
versions for an intermediate IBuild
diff --git a/releng/build-scripts/build/otdt_prerequisites.sh b/releng/build-scripts/build/otdt_prerequisites.sh
index 41fd4e0..4f0cf2a 100644
--- a/releng/build-scripts/build/otdt_prerequisites.sh
+++ b/releng/build-scripts/build/otdt_prerequisites.sh
@@ -48,11 +48,11 @@
# VERSIONS:
# Eclipse SKD build identifier:
-EVERSION=3.7M2a
+EVERSION=I20101019-0800
# Architecture (as used by OSGi):
ARCH=`arch`
# used only locally:
-DROP=${BASEDIR}/drops/S-3.7M2a-201009211024
+DROP=${BASEDIR}/drops/I20101019-0800
# EXPORT: archive file of the base eclipse SDK build:
ECLIPSE_SDK_TGZ=${DROP}/eclipse-SDK-${EVERSION}-linux-gtk-${ARCH}.tar.gz
diff --git a/releng/build-scripts/build/run.properties b/releng/build-scripts/build/run.properties
index a09d7a2..239f4bc 100644
--- a/releng/build-scripts/build/run.properties
+++ b/releng/build-scripts/build/run.properties
@@ -23,7 +23,7 @@
# Version dependent names:
# Details of the Eclipse SDK build upon:
-run.eclipseScriptDir=plugins/org.eclipse.pde.build_3.6.100.v20100830/scripts
+run.eclipseScriptDir=plugins/org.eclipse.pde.build_3.6.100.v20101018/scripts
org.eclipse.equinox.launcher_jar=org.eclipse.equinox.launcher_1.2.0.v20100824b.jar
# for patching our patch feature to match this version with any suffix:
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"/>
diff --git a/releng/build-scripts/build/test.properties b/releng/build-scripts/build/test.properties
index ccf1b51..c134c02 100644
--- a/releng/build-scripts/build/test.properties
+++ b/releng/build-scripts/build/test.properties
@@ -1,14 +1,14 @@
# versions of test plugins:
-org.eclipse.jdt.core.tests.builder=org.eclipse.jdt.core.tests.builder_3.4.0.v_B14a
+org.eclipse.jdt.core.tests.builder=org.eclipse.jdt.core.tests.builder_3.4.0.v_B18
org.eclipse.jdt.core.tests.compiler=org.eclipse.jdt.core.tests.compiler_3.4.0
org.eclipse.jdt.core.tests.model=org.eclipse.jdt.core.tests.model_3.4.0
org.eclipse.test.performance=org.eclipse.test.performance_3.6.0
org.eclipse.jdt.debug.tests=org.eclipse.jdt.debug.tests_3.1.100
-org.eclipse.jdt.ui.tests=org.eclipse.jdt.ui.tests_3.7.0.v20100912-2000
-org.eclipse.jdt.ui.tests.refactoring=org.eclipse.jdt.ui.tests.refactoring_3.7.0.v20100907-0800
+org.eclipse.jdt.ui.tests=org.eclipse.jdt.ui.tests_3.7.0.v20101012-0800
+org.eclipse.jdt.ui.tests.refactoring=org.eclipse.jdt.ui.tests.refactoring_3.7.0.v20101019-0800
# this is part of eclipse-test-framework and holds library.xml:
-org.eclipse.test=org.eclipse.test_3.3.0
+org.eclipse.test=org.eclipse.test_3.3.100
org.eclipse.objectteams.otdt.tests=org.eclipse.objectteams.otdt.tests_1.3.0
org.eclipse.objectteams.otdt.ui.tests=org.eclipse.objectteams.otdt.ui.tests_1.3.0
diff --git a/releng/build-scripts/build/test.xml b/releng/build-scripts/build/test.xml
index 592efcf..97b723a 100644
--- a/releng/build-scripts/build/test.xml
+++ b/releng/build-scripts/build/test.xml
@@ -166,6 +166,26 @@
<!-- antcall target="otdt_metrics_tests" / -->
<!--/parallel-->
</target>
+
+ <target name="otdt-tests">
+<!-- enable if we want to debug otre/otequinox:
+<property name="extraVMargs" value="-Dot.dump=1 -Dotequinox.debug=OK" />
+-->
+ <!-- debug tests don't like parallelization -->
+ <antcall target="otdt_debug_tests" />
+ <!--parallel threadCount="2"-->
+ <!-- "slow", ui tests come first -->
+ <antcall target="otdt_ui_tests" />
+ <antcall target="otdt_ref_tests" />
+ <antcall target="otdt_dom_tests" />
+ <antcall target="otdt_tests" />
+ <antcall target="jdt_builder_tests" />
+ <antcall target="jdtcore_compiler_tests" />
+ <antcall target="jdtcore_model_tests" />
+ <antcall target="otdt_builder_tests" />
+ <!-- antcall target="otdt_metrics_tests" / -->
+ <!--/parallel-->
+ </target>
<target name="onlyone">
<antcall target="otdt_ui_tests" />