- Move diff to unified

- Hint about variable modification inside script (not through environment)
- Integrate forgotten case ibm/not-wf/p28a (only case with lower p)
- Tell we expected not well-formed when we do instead of the opposite

diff --git a/expat/tests/xmltest.sh b/expat/tests/xmltest.sh
index 725441edb69eeb5e24a7809fc14c16f0ef69cfd6..793a5cc2819bb4cbc4714cf337e5783b8bdf75b2 100755 (executable)
--- a/expat/tests/xmltest.sh
+++ b/expat/tests/xmltest.sh
@@ -6,7 +6,7 @@
 # w3c.org xml test suite, available from
 # http://www.w3.org/XML/Test/xmlts20020606.zip.
 
-# To run this script, first set XMLWF so that xmlwf can be
+# To run this script, first set XMLWF below so that xmlwf can be
 # found, then set the output directory with OUTPUT.
 
 # The script lists all test cases where Expat shows a discrepancy
@@ -39,7 +39,7 @@ RunXmlwfNotWF() {
   $XMLWF -p "$file" > outfile || return $?
   read outdata < outfile
   if test "$outdata" = "" ; then
-      echo "Expected well-formed: $reldir$file"
+      echo "Expected not well-formed: $reldir$file"
       return 1
   else
       return 0
@@ -55,7 +55,7 @@ RunXmlwfWF() {
   read outdata < outfile 
   if test "$outdata" = "" ; then 
       if [ -f "out/$file" ] ; then 
-          diff "$OUTPUT$reldir$file" "out/$file" > outfile 
+          diff -u "$OUTPUT$reldir$file" "out/$file" > outfile 
           if [ -s outfile ] ; then 
               cp outfile "$OUTPUT$reldir$file.diff"
               echo "Output differs: $reldir$file"
@@ -117,6 +117,7 @@ rm outfile
 
 cd "$TS/xmlconf"
 for xmldir in ibm/not-wf/P* \
+              ibm/not-wf/p28a \
               ibm/not-wf/misc \
               xmltest/not-wf/ext-sa \
               xmltest/not-wf/not-sa \