cleanup and simplify

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

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"/>

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

releng.wtpbuilder/distribution/patches32x.tests/tobeInstalled.properties

+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