cleanup and simplify

releng.wtpbuilder/components/wtp-patches32x/tobeInstalled.properties

@@ -9,4 +9,6 @@ getprereq.dtp=false
 #getprereq.wst=false
 #getprereq.jst=false
 getprereq.wtp=false
-#getprereq.dltk=false
+#getprereq.dltk=false
\ No newline at end of file
+
+getprereq.testlibraries=true
\ No newline at end of file

releng.wtpbuilder/distribution/jsdt.tests/build.xml

@@ -136,11 +136,7 @@
     </target>
     <target
         name="unzipTests">
-        <!--
-            unzip the builds and junit tests we use 'unzip' here, so we
-            can continue on error, if desired. (such as if zip was not
-            created, due to other failures or options).
-        -->
+
         <java
             taskname="p2Director Install"
             fork="true"

releng.wtpbuilder/distribution/jsdt.tests/testScripts/test.xml

@@ -96,6 +96,9 @@
            </fileset>
        </subant>
        <!-- copy early, if we can  -->
+
+        <antcall
+            target="genHtml"/>
         <ant
             antfile="${wtp.builder.home}/scripts/build/copyArtifactsEarly.xml"/>
       	<subant
@@ -122,6 +125,16 @@
             message="Ended Unit Tests"/>
         <antcall
             target="genHtml"/>
+
+        <available
+            file="${results}/xml"
+            type="dir"
+            property="resultsWereGenerated"/>
+
+        <fail
+            unless="resultsWereGenerated"
+            message="Unit tests results were not generated when expected. Probable build error."/>
+
     </target>
     <!--
         by making 'all' the default, and "runOneTestBundle" as its
@@ -166,10 +179,24 @@
     <target
         name="genHtml"
         description="Generates HTML results with provided JUNIT.XSL provided"
-        unless="genHtml.disable">
+        depends="checkGenHTMLConditions"
+        if="resultsWereGenerated">
         <xslt
             style="JUNIT.XSL"
             basedir="${results}/xml"
             destdir="${results}/html"/>
     </target>
+	<!-- 
+	It is a likely a build error if no results have been produced ... but error 
+	message from xslt failure is not very clear. 
+	-->
+    <target
+        name="checkGenHTMLConditions">
+	<echo message="results xml: ${results}/xml" />
+        <available
+            file="${results}/xml"
+            type="dir"
+            property="resultsWereGenerated"/>
+    </target>
+
 </project>
\ No newline at end of file