Added code to fail the SAVerify command when validation failed

[mirror_edk2.git] / Tools / Source / SurfaceArea / build.xml

diff --git a/Tools/Source/SurfaceArea/build.xml b/Tools/Source/SurfaceArea/build.xml
index 703673ba16b62885faec47a8d12d90c54e6d2a32..7e6368386fda57d20308d59b7c3f380dcd4bf274 100644 (file)
--- a/Tools/Source/SurfaceArea/build.xml
+++ b/Tools/Source/SurfaceArea/build.xml
@@ -100,7 +100,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     -->\r
     <copy file="${SURFACE_AREA_FILE}" tofile="${SURFACE_AREA_FILE}.xml"/>\r
     <java classname="org.apache.xmlbeans.impl.tool.InstanceValidator" \r
-      outputproperty="XMLBEANS_OUTPUT" >\r
+          outputproperty="XMLBEANS_OUTPUT"\r
+          resultproperty="XMLBEANS_RESULT"\r
+          errorproperty="XMLBEANS_ERROR">\r
           \r
       <classpath refid="classpath"/>\r
       <arg value="-dl"/>\r
@@ -110,7 +112,15 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </java>   \r
 \r
     <delete file="${SURFACE_AREA_FILE}.xml" quiet="true"/>\r
-    <echo message="Result ... ${XMLBEANS_OUTPUT}"/>\r
+    <if>\r
+      <contains string="${XMLBEANS_OUTPUT}" substring="NOT valid"/>\r
+      <then>\r
+        <fail message="Result ... ${XMLBEANS_OUTPUT}"/>\r
+      </then>\r
+      <else>\r
+        <echo message="Result ... ${XMLBEANS_OUTPUT}"/>\r
+      </else>\r
+    </if>\r
   </target>\r
   \r
   <!--\r