Added more error check on validation to let result be more exact.

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

diff --git a/Tools/Source/SurfaceArea/build.xml b/Tools/Source/SurfaceArea/build.xml
index 7e6368386fda57d20308d59b7c3f380dcd4bf274..f6e512b5a120e78c33a6fa7c16e53ae83f4126f6 100644 (file)
--- a/Tools/Source/SurfaceArea/build.xml
+++ b/Tools/Source/SurfaceArea/build.xml
@@ -101,7 +101,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <copy file="${SURFACE_AREA_FILE}" tofile="${SURFACE_AREA_FILE}.xml"/>\r
     <java classname="org.apache.xmlbeans.impl.tool.InstanceValidator" \r
           outputproperty="XMLBEANS_OUTPUT"\r
-          resultproperty="XMLBEANS_RESULT"\r
           errorproperty="XMLBEANS_ERROR">\r
           \r
       <classpath refid="classpath"/>\r
@@ -113,12 +112,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
     <delete file="${SURFACE_AREA_FILE}.xml" quiet="true"/>\r
     <if>\r
-      <contains string="${XMLBEANS_OUTPUT}" substring="NOT valid"/>\r
+      <or>\r
+        <contains string="${XMLBEANS_OUTPUT}" substring="NOT valid"/>\r
+        <contains string="${XMLBEANS_OUTPUT}" substring=": error:"/>\r
+        <contains string="${XMLBEANS_ERROR}" substring="XmlException"/>\r
+        <contains string="${XMLBEANS_ERROR}" substring=": error:"/>\r
+      </or>\r
       <then>\r
-        <fail message="Result ... ${XMLBEANS_OUTPUT}"/>\r
+        <echo message="Result ... ${XMLBEANS_OUTPUT}&#x0d;&#x0a;${XMLBEANS_ERROR}"/>\r
+        <fail message="${SURFACE_AREA_FILE} is invalid!"/>\r
       </then>\r
       <else>\r
-        <echo message="Result ... ${XMLBEANS_OUTPUT}"/>\r
+        <echo message="Result ... ${SURFACE_AREA_FILE} is valid"/>\r
       </else>\r
     </if>\r
   </target>\r