From 775831479277445cffbb06da14b174d6b492dee0 Mon Sep 17 00:00:00 2001
From: david_williams <david_williams>
Date: Mon, 27 Sep 2010 04:19:53 +0000
Subject: [PATCH] cleanup and simplify
---
.../wtp-patches32x/tobeInstalled.properties | 1 -
.../distribution/patches32x.tests/build.xml | 12 +++++++++++-
.../patches32x.tests/testScripts/test.xml | 4 ++++
.../patches32x.tests/tobeInstalled.properties | 14 ++++++++++++++
4 files changed, 29 insertions(+), 2 deletions(-)
create mode 100644 releng.wtpbuilder/distribution/patches32x.tests/tobeInstalled.properties
diff --git a/releng.wtpbuilder/components/wtp-patches32x/tobeInstalled.properties b/releng.wtpbuilder/components/wtp-patches32x/tobeInstalled.properties
index 795e3ec0a..75beda86c 100644
--- a/releng.wtpbuilder/components/wtp-patches32x/tobeInstalled.properties
+++ b/releng.wtpbuilder/components/wtp-patches32x/tobeInstalled.properties
@@ -11,4 +11,3 @@ getprereq.dtp=false
getprereq.wtp=false
#getprereq.dltk=false
-getprereq.testlibraries=true
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/patches32x.tests/build.xml b/releng.wtpbuilder/distribution/patches32x.tests/build.xml
index d3cef4c25..17be30819 100644
--- a/releng.wtpbuilder/distribution/patches32x.tests/build.xml
+++ b/releng.wtpbuilder/distribution/patches32x.tests/build.xml
@@ -92,19 +92,29 @@
unless="dependency.properties.exists"/>
<property
name="test.dependency"
- value="${buildDirectory}/maps/${env.RELENG}/${testdependencyFileLocation}"/>
+ value="${wtp.builder.home}/scripts/dependency/dependency.xml"/>
<available
file="${test.dependency}"
property="test.dependency.exists"/>
<fail
message="test dependency file not found: ${test.dependency}"
unless="test.dependency.exists"/>
+ <echo message="test.dependency file: ${test.dependency}" />
<ant
antfile="${test.dependency}"
target="get">
<property
name="base.install.dir"
value="${testRoot}"/>
+ <property
+ name="tobeinstalled.properties"
+ value="${wtp.builder.home}/distribution/${build.distribution}.tests/tobeInstalled.properties"/>
+ <property
+ name="installWorkingDirectory"
+ value="${testRoot}"/>
+
+
+
</ant>
<antcall
target="unzipTests"/>
diff --git a/releng.wtpbuilder/distribution/patches32x.tests/testScripts/test.xml b/releng.wtpbuilder/distribution/patches32x.tests/testScripts/test.xml
index 51013ce3d..5b0d54e40 100644
--- a/releng.wtpbuilder/distribution/patches32x.tests/testScripts/test.xml
+++ b/releng.wtpbuilder/distribution/patches32x.tests/testScripts/test.xml
@@ -121,8 +121,12 @@
<subant
target=""
inheritall="true">
+ <!-- note that we specify "high" directory to get tests installed
+ in any location -->
<fileset
dir="${testRoot}">
+ <!-- but we must be sure to exclude _this_ test.xml file
+ we are running -->
<exclude
name="test.xml"/>
<exclude
diff --git a/releng.wtpbuilder/distribution/patches32x.tests/tobeInstalled.properties b/releng.wtpbuilder/distribution/patches32x.tests/tobeInstalled.properties
new file mode 100644
index 000000000..babb454ee
--- /dev/null
+++ b/releng.wtpbuilder/distribution/patches32x.tests/tobeInstalled.properties
@@ -0,0 +1,14 @@
+getprereq.eclipse=true
+getprereq.eclipsetestframework=true
+#getprereq.eclipseplatform=false
+getprereq.emf=false
+getprereq.emfxsd=false
+#getprereq.emfvalidation=false
+getprereq.gef=false
+getprereq.dtp=false
+#getprereq.wst=false
+#getprereq.jst=false
+getprereq.wtp=false
+#getprereq.dltk=false
+
+getprereq.testlibraries=true
--
GitLab