diff --git a/releng.wtpbuilder/components/wtp-patches32x/tobeInstalled.properties b/releng.wtpbuilder/components/wtp-patches32x/tobeInstalled.properties index be28091f3369b7e3f866510198a3f665f353afc5..795e3ec0a8491c527f941e29e599910879101e8e 100644 --- a/releng.wtpbuilder/components/wtp-patches32x/tobeInstalled.properties +++ b/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 \ No newline at end of file +#getprereq.dltk=false + +getprereq.testlibraries=true \ No newline at end of file diff --git a/releng.wtpbuilder/distribution/jsdt.tests/build.xml b/releng.wtpbuilder/distribution/jsdt.tests/build.xml index 4c553b294afbc54a9e23618d1101689b66814f71..4757ffc3f8833a57049ac80302b0ab374554710c 100644 --- a/releng.wtpbuilder/distribution/jsdt.tests/build.xml +++ b/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" diff --git a/releng.wtpbuilder/distribution/jsdt.tests/testScripts/test.xml b/releng.wtpbuilder/distribution/jsdt.tests/testScripts/test.xml index 2255835374948b5769e3dd475b3222f40caab57a..248cd02afeee77bf8690b404316430ceeb9844c9 100644 --- a/releng.wtpbuilder/distribution/jsdt.tests/testScripts/test.xml +++ b/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