diff --git a/releng.wtpbuilder/components/dali.tests/customTargets.xml b/releng.wtpbuilder/components/dali.tests/customTargets.xml
index eb76143c1e26623af6ebcd1ac715369d11f98e04..2a5ec38e9a2a4d2dab7befe0dd1696276f3e98a3 100644
--- a/releng.wtpbuilder/components/dali.tests/customTargets.xml
+++ b/releng.wtpbuilder/components/dali.tests/customTargets.xml
@@ -48,7 +48,7 @@
<property
name="archiveName"
value="wtp-jpa-Automated-Tests-${buildLabel}.zip" />
-
+
<ant
antfile="${wtp.builder.home}/scripts/build/buildutilities.xml"
target="unpackUpdateJarsAndCreateZippedPackages">
@@ -87,27 +87,47 @@
<property
name="mapVersionTag"
value="HEAD" />
- <property
- name="cvsPackage"
- value="releng.dali" />
+
+ <!-- get releng/maps -->
+ <antcall target="checkOutMaps">
+ <param
+ name="cvsPackage"
+ value="releng" />
+ </antcall>
+
+ <!-- get releng.dali/maps -->
+ <antcall target="checkOutMaps">
+ <param
+ name="cvsPackage"
+ value="releng.dali" />
+ </antcall>
+
+ <!-- tag the map files project -->
+ <antcall target="tagMapFiles">
+ <param
+ name="mapCvsRoot"
+ value="${mapCvsRoot}" />
+ </antcall>
+ </target>
+
+ <!-- ===================================================================== -->
+ <!-- Check out the cvsPackage -->
+ <!-- ===================================================================== -->
+ <target name="checkOutMaps">
<echo message="${mapCvsRoot} ${mapVersionTag} " />
<echo message="cvsPackage = ${cvsPackage} " />
-
<cvs
cvsRoot="${mapCvsRoot}"
package="${cvsPackage}"
dest="${buildDirectory}/maps"
tag="${mapVersionTag}" />
- <!--tag the map files project-->
- <antcall target="tagMapFiles">
- <param
- name="mapCvsRoot"
- value="${mapCvsRoot}" />
- </antcall>
+
</target>
- <target
- name="tagMapFiles"
+ <!-- ===================================================================== -->
+ <!-- Tag Map Files mapCvsRoot -->
+ <!-- ===================================================================== -->
+ <target name="tagMapFiles"
if="tagMaps">
<cvs
cvsRoot="${mapCvsRoot}"
@@ -129,13 +149,26 @@
property="component.dir" />
<echo message="ant.file: ${ant.file}" />
<echo message="component.dir: ${component.dir}" />
-
+
+ <property
+ name="dependencies.combined"
+ value="dependencies.combined.properties" />
+
+ <!-- Combine releng and releng.dali -->
+ <delete file="${buildDirectory}/maps/releng.dali/maps/${dependencies.combined}" failonerror="false" />
+ <concat destfile="${buildDirectory}/maps/releng.dali/maps/${dependencies.combined}">
+ <fileset dir="${buildDirectory}/maps">
+ <include name="releng/maps/dependencies.properties"/>
+ <include name="releng.dali/maps/dependencies.properties"/>
+ </fileset>
+ </concat>
+
<ant
antfile="${component.dir}/dependency.xml"
target="get">
<property
name="dependency.properties"
- value="${buildDirectory}/maps/releng/maps/dependencies.properties" />
+ value="${buildDirectory}/maps/releng.dali/maps/${dependencies.combined}" />
<property
name="base.install.dir"
value="${buildRoot}" />
@@ -150,30 +183,7 @@
<property
name="featuresRecursively"
value="true" />
-
- <ant
- antfile="${genericTargets}"
- dir="${pde.build.scripts}"
- target="fetchElement">
- <property
- name="type"
- value="feature" />
- <property
- name="id"
- value="org.eclipse.jpa.tests" />
- </ant>
-
- <ant
- antfile="${genericTargets}"
- dir="${pde.build.scripts}"
- target="fetchElement">
- <property
- name="type"
- value="feature" />
- <property
- name="id"
- value="org.eclipse.wst" />
- </ant>
+
<ant
antfile="${genericTargets}"
dir="${pde.build.scripts}"
@@ -183,7 +193,7 @@
value="feature" />
<property
name="id"
- value="org.eclipse.jst" />
+ value="org.eclipse.jst.jpa.feature" />
</ant>
</target>
diff --git a/releng.wtpbuilder/distribution/dali.tests/build.xml b/releng.wtpbuilder/distribution/dali.tests/build.xml
index f52084e9947a78faa65a6e243249aeb582f17aa0..290857c825463b50a373d30674cbbcc57a0bb4f8 100644
--- a/releng.wtpbuilder/distribution/dali.tests/build.xml
+++ b/releng.wtpbuilder/distribution/dali.tests/build.xml
@@ -23,6 +23,9 @@
<ant antfile="${wtp.builder.home}/scripts/build/label.xml" />
<property file="${wtp.builder.home}/build.properties" />
<property file="${buildDirectory}/label.properties" />
+ <property
+ name="dependencies.combined"
+ value="dependencies.combined.properties" />
<mkdir dir="${testRoot}" />
<mkdir dir="${testRoot}/results" />
@@ -35,11 +38,11 @@
<echo message="BASEOS: ${env.BASEOS} BASEWS: ${env.BASEWS} BASEARCH: ${env.BASEARCH} " />
<ant antfile="${test.component.dir}/testdependency.xml" target="get">
- <property name="dependency.properties" value="${buildDirectory}/maps/releng.dali/maps/dependencies.properties" />
+ <property name="dependency.properties" value="${buildDirectory}/maps/releng.dali/maps/${dependencies.combined}" />
<property name="base.install.dir" value="${testRoot}" />
</ant>
- <unzip dest="${testRoot}" src="${buildDirectory}/${buildLabel}/wtp-jpa-${buildLabel}.zip" overwrite="true" />
- <unzip dest="${testRoot}" src="${buildDirectory}/${buildLabel}/wtp-jpa-Automated-Tests-${buildLabel}.zip" overwrite="true" />
+
+ <antcall target="unzipTests" />
<antcall target="runTestEclipse">
<param name="testTarget" value="all" />
@@ -48,11 +51,33 @@
<param name="testTarget" value="all" />
</antcall>
-
</target>
+ <target name="unzipTests">
+
+ <!--unzip the builds and junit tests
+ we use 'unzip' here, so we can continue on error
+ (such as if zip was not created, due to other failures or options).
+ -->
+ <exec
+ dir="${buildDirectory}/${buildLabel}"
+ executable="unzip"
+ failonerror="false">
+ <arg line="-o -qq wtp-jpa-${buildLabel}.zip -d ${testRoot}" />
+ </exec>
+
+ <exec
+ dir="${buildDirectory}/${buildLabel}"
+ executable="unzip"
+ failonerror="false">
+ <arg line="-o -qq wtp-jpa-Automated-Tests-${buildLabel}.zip -d ${testRoot}" />
+ </exec>
+
+ </target>
+
<target name="runTestEclipse">
- <java taskname="test-dali-${testTarget}" jar="${testRoot}/eclipse/startup.jar" fork="true" failonerror="true" timeout="3600000" output="${testRoot}/results/consolelogs/dalitestlog.txt" dir="${testRoot}">
+
+ <java taskname="test-dali-${testTarget}" jar="${testRoot}/eclipse/startup.jar" fork="true" failonerror="true" timeout="3600000" output="${testRoot}/results/consolelogs/dalitestlog.txt" dir="${testRoot}">
<jvmarg value="-Dosgi.ws=${env.BASEWS}" />
<jvmarg value="-Dosgi.os=${env.BASEOS}" />
<jvmarg value="-Dosgi.arch=${env.BASEARCH}" />
diff --git a/releng.wtpbuilder/distribution/dali.tests/dependency.xml b/releng.wtpbuilder/distribution/dali.tests/dependency.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8b55f68bcfe5403351200b563f6af9c3e929190b
--- /dev/null
+++ b/releng.wtpbuilder/distribution/dali.tests/dependency.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0"?>
+<!-- ======================================================================
+ Properties that must be passed to this script:
+ base.install.dir
+ dependencyTargets
+ local.cache.dir
+ dependency.properties
+
+
+ ====================================================================== -->
+<project
+ name="test"
+ default="get">
+
+ <target name="get">
+ <antcall target="getAndInstall">
+ <param name="groupId" value="orbitthirdparty" />
+ </antcall>
+ <antcall target="getAndInstall">
+ <param
+ name="groupId"
+ value="emf" />
+ </antcall>
+ <antcall target="getAndInstall">
+ <param
+ name="groupId"
+ value="gef" />
+ </antcall>
+ <antcall target="getAndInstall">
+ <param
+ name="groupId"
+ value="dtp" />
+ </antcall>
+ <antcall target="getAndInstall">
+ <param
+ name="groupId"
+ value="eclipse" />
+ </antcall>
+ <antcall target="getAndInstall">
+ <param
+ name="groupId"
+ value="eclipseTestFramework" />
+ </antcall>
+
+ <antcall target="getAndInstallWSTTests" />
+
+ </target>
+
+
+ <target name="getAndInstall" unless="skipGetAndInstall">
+ <ant
+ antfile="${dependencyTargets}"
+ target="checkDependency">
+ <property
+ name="groupId"
+ value="${groupId}" />
+ </ant>
+ <ant
+ antfile="${dependencyTargets}"
+ target="installDependency">
+ <property
+ name="groupId"
+ value="${groupId}" />
+ <property
+ name="install.destination"
+ value="${base.install.dir}" />
+ </ant>
+ </target>
+
+ <target name="getAndInstallWSTTests">
+ <mkdir dir="${baseLocation}/plugins/_temp_"/>
+ <copy todir="${baseLocation}/plugins/_temp_">
+ <fileset dir="${baseLocation}/plugins">
+ <include name="org.eclipse.wst.common.tests.collector*/**"/>
+ </fileset>
+ <mapper type="merge" to="wst.common.tests.collector"/>
+ </copy>
+
+ <available property="skipGetAndInstall"
+ value="true"
+ file="${baseLocation}/plugins/_temp_/wst.common.tests.collector"
+ type="file" />
+ <delete dir="${baseLocation}/plugins/_temp_" failonerror="false" />
+
+ <antcall target="getAndInstall">
+ <param
+ name="groupId"
+ value="wstAutomatedTests" />
+ </antcall>
+
+ </target>
+
+</project>
diff --git a/releng.wtpbuilder/distribution/dali.tests/testScripts/test.properties b/releng.wtpbuilder/distribution/dali.tests/testScripts/test.properties
index 4c774bcfb27b7b32060b1f395740feefa9ec5338..f3b7824af479fa8509ca40631b0ac246dfc890a9 100644
--- a/releng.wtpbuilder/distribution/dali.tests/testScripts/test.properties
+++ b/releng.wtpbuilder/distribution/dali.tests/testScripts/test.properties
@@ -1,16 +1,3 @@
org.eclipse.jst.jpa.utility.tests=org.eclipse.jst.jpa.utility.tests_1.0.0
-
-
-# Performance database properties
-#perf.dbloc=/home/eteration/build-home/derby/wtpPerfDB
-perf.dbloc=wtp-perf-db
-perf.config=wtpbuild
-perf.jvm=sun1.4.2
-perf.ref.config=wtpbuild
-perf.ref.buildId=I20050513-0702
-perf.ref.jvm=sun1.4.2
-
-# SWT
-#swt.lib.path=org.eclipse.swt.motif_3.1.0/os/linux/x86
-swt.lib.path=org.eclipse.swt.win32_3.1.0/os/win32/x86
\ No newline at end of file
+org.eclipse.jst.jpa.core.tests=org.eclipse.jst.jpa.core.tests_1.0.0
diff --git a/releng.wtpbuilder/distribution/dali.tests/testScripts/test.xml b/releng.wtpbuilder/distribution/dali.tests/testScripts/test.xml
index 7450169952574fac1d218ea6afdaec30bd79bc90..30652687a3e330aac083a3407f8845d1ef162ae1 100644
--- a/releng.wtpbuilder/distribution/dali.tests/testScripts/test.xml
+++ b/releng.wtpbuilder/distribution/dali.tests/testScripts/test.xml
@@ -82,18 +82,28 @@
<param name="report" value="org.eclipse.jst.jpa.utility.tests" />
</antcall>
</target>
-
+ <target name="dali-core-tests" description="Runs the org.eclipse.jst.jpa.core.tests test.xml">
+ <antcall target="runtests">
+ <param name="testPlugin" value="${org.eclipse.jst.jpa.core.tests}" />
+ <param name="report" value="org.eclipse.jst.jpa.core.tests" />
+ </antcall>
+ </target>
+
+
<target name="all" depends="init">
<echo message="Starting Dali Unit Tests"/>
<echo message="Starting dali-utility-tests"/>
<antcall target="dali-utility-tests" />
+ <echo message="Starting dali-core-tests"/>
+ <antcall target="dali-core-tests" />
<echo message="Ended Dali Unit Tests"/>
</target>
+
<target name="setupPerformance">
<delete dir="${perfDir}"/>
<mkdir dir="${perfDir}"/>
diff --git a/releng.wtpbuilder/distribution/dali.tests/testdependency.xml b/releng.wtpbuilder/distribution/dali.tests/testdependency.xml
index fca9e6be70e956f947b116719e98cc00ea3501a8..2bacbea2f833845ca11b028bc39961c534e63e6b 100644
--- a/releng.wtpbuilder/distribution/dali.tests/testdependency.xml
+++ b/releng.wtpbuilder/distribution/dali.tests/testdependency.xml
@@ -11,21 +11,24 @@
<target name="get">
+ <antcall target="getAndInstall">
+ <param name="groupId" value="orbitthirdparty" />
+ </antcall>
<antcall target="getAndInstall">
<param name="groupId" value="emf" />
</antcall>
<antcall target="getAndInstall">
<param name="groupId" value="gef" />
</antcall>
- <antcall target="getAndInstall">
- <param name="groupId" value="jem" />
- </antcall>
+ <antcall target="getAndInstall">
+ <param name="groupId" value="dtp" />
+ </antcall>
<antcall target="getAndInstall">
<param name="groupId" value="wtp" />
</antcall>
- <antcall target="getAndInstall">
- <param name="groupId" value="dtp" />
- </antcall>
+ <antcall target="getAndInstall">
+ <param name="groupId" value="wstAutomatedTests" />
+ </antcall>
<antcall target="getAndInstall">
<param name="groupId" value="eclipse" />
</antcall>