From 1ca89729761dbf0782f72986ed608db422d864f5 Mon Sep 17 00:00:00 2001
From: david_williams <david_williams>
Date: Wed, 21 Feb 2007 20:29:05 +0000
Subject: [PATCH] [175017] Update Dali Test scripts for Bug 175014
---
.../components/dali.tests/dependency.xml | 30 +++----------------
.../dali.tests/testdependency.xml | 3 --
2 files changed, 4 insertions(+), 29 deletions(-)
diff --git a/releng.wtpbuilder/components/dali.tests/dependency.xml b/releng.wtpbuilder/components/dali.tests/dependency.xml
index 8b55f68bc..5843fc03b 100644
--- a/releng.wtpbuilder/components/dali.tests/dependency.xml
+++ b/releng.wtpbuilder/components/dali.tests/dependency.xml
@@ -13,6 +13,7 @@
default="get">
<target name="get">
+
<antcall target="getAndInstall">
<param name="groupId" value="orbitthirdparty" />
</antcall>
@@ -41,13 +42,12 @@
name="groupId"
value="eclipseTestFramework" />
</antcall>
-
- <antcall target="getAndInstallWSTTests" />
-
+
</target>
<target name="getAndInstall" unless="skipGetAndInstall">
+
<ant
antfile="${dependencyTargets}"
target="checkDependency">
@@ -65,29 +65,7 @@
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/testdependency.xml b/releng.wtpbuilder/distribution/dali.tests/testdependency.xml
index 2bacbea2f..978d800fa 100644
--- a/releng.wtpbuilder/distribution/dali.tests/testdependency.xml
+++ b/releng.wtpbuilder/distribution/dali.tests/testdependency.xml
@@ -26,9 +26,6 @@
<antcall target="getAndInstall">
<param name="groupId" value="wtp" />
</antcall>
- <antcall target="getAndInstall">
- <param name="groupId" value="wstAutomatedTests" />
- </antcall>
<antcall target="getAndInstall">
<param name="groupId" value="eclipse" />
</antcall>
--
GitLab