add emf validation pre-req

9dd85949 · david_williams · 5fb610f1 · 9dd85949 · 9dd85949 · 9dd85949
Commit 9dd85949 authored 15 years ago by david_williams
--- a/releng.wtpbuilder/buildtemplates/distribution/template.tests/build.xml
+++ b/releng.wtpbuilder/buildtemplates/distribution/template.tests/build.xml
@@ -124,7 +124,7 @@
        <exec
            dir="${buildDirectory}/${buildLabel}"
            executable="unzip"
-            failonerror="true">
+            failonerror="false">
            <arg
                line="-o -qq @zipprefix@-tests-${buildLabel}.zip -d ${testRoot}${dropinsFolder}"/>
        </exec>

--- a/releng.wtpbuilder/buildtemplates/distribution/template.tests/testdependency.xml
+++ b/releng.wtpbuilder/buildtemplates/distribution/template.tests/testdependency.xml
@@ -33,12 +33,12 @@
                name="groupId"
                value="emfxsd"/>
        </antcall>
-                     <antcall
+        <antcall
-                         target="getAndInstallDropins">
+            target="getAndInstallDropins">
-                         <param
+            <param
-                             name="groupId"
+                name="groupId"
-                             value="emfvalidation"/>
+                value="emfvalidation"/>
-                     </antcall>
+        </antcall>
        <antcall
            target="getAndInstallDropins">
            <param
@@ -57,10 +57,12 @@
                name="groupId"
                value="eclipseTestFramework"/>
        </antcall>
-        <!--
+        <antcall
-            <antcall target="getAndInstallDropins"> <param name="groupId"
+            target="getAndInstallDropins">
-            value="dtp"/> </antcall>
+            <param
-        -->
+                name="groupId"
+                value="dtp"/>
+        </antcall>
        <antcall
            target="getAndInstallDropins">
            <param

--- a/releng.wtpbuilder/distribution/jaxws.tests/build.xml
+++ b/releng.wtpbuilder/distribution/jaxws.tests/build.xml
@@ -124,7 +124,7 @@
        <exec
            dir="${buildDirectory}/${buildLabel}"
            executable="unzip"
-            failonerror="true">
+            failonerror="false">
            <arg
                line="-o -qq wtp-incubator-jaxws-tests-${buildLabel}.zip -d ${testRoot}${dropinsFolder}"/>
        </exec>

--- a/releng.wtpbuilder/distribution/jaxws.tests/testdependency.xml
+++ b/releng.wtpbuilder/distribution/jaxws.tests/testdependency.xml
@@ -33,12 +33,12 @@
                name="groupId"
                value="emfxsd"/>
        </antcall>
-                     <antcall
+        <antcall
-                         target="getAndInstallDropins">
+            target="getAndInstallDropins">
-                         <param
+            <param
-                             name="groupId"
+                name="groupId"
-                             value="emfvalidation"/>
+                value="emfvalidation"/>
-                     </antcall>
+        </antcall>
        <antcall
            target="getAndInstallDropins">
            <param
@@ -57,10 +57,12 @@
                name="groupId"
                value="eclipseTestFramework"/>
        </antcall>
-        <!--
+        <antcall
-            <antcall target="getAndInstallDropins"> <param name="groupId"
+            target="getAndInstallDropins">
-            value="dtp"/> </antcall>
+            <param
-        -->
+                name="groupId"
+                value="dtp"/>
+        </antcall>
        <antcall
            target="getAndInstallDropins">
            <param