diff options
Diffstat (limited to 'tests/xmltest.sh')
| -rwxr-xr-x | tests/xmltest.sh | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/tests/xmltest.sh b/tests/xmltest.sh index 64a17eec06f5b..2b8cb196b385c 100755 --- a/tests/xmltest.sh +++ b/tests/xmltest.sh @@ -25,12 +25,14 @@ shopt -s nullglob MYDIR="`dirname \"$0\"`" cd "$MYDIR" MYDIR="`pwd`" -XMLWF="`dirname \"$MYDIR\"`/xmlwf/xmlwf" +XMLWF="${1:-`dirname \"$MYDIR\"`/xmlwf/xmlwf}" # XMLWF=/usr/local/bin/xmlwf TS="$MYDIR" # OUTPUT must terminate with the directory separator. OUTPUT="$TS/out/" # OUTPUT=/home/tmp/xml-testsuite-out/ +# Unicode-aware diff utility +DIFF="$TS/udiffer.py" # RunXmlwfNotWF file reldir @@ -53,11 +55,11 @@ RunXmlwfNotWF() { RunXmlwfWF() { file="$1" reldir="$2" - $XMLWF -p -d "$OUTPUT$reldir" "$file" > outfile || return $? + $XMLWF -p -N -d "$OUTPUT$reldir" "$file" > outfile || return $? read outdata < outfile if test "$outdata" = "" ; then if [ -f "out/$file" ] ; then - diff -u "$OUTPUT$reldir$file" "out/$file" > outfile + $DIFF "$OUTPUT$reldir$file" "out/$file" > outfile if [ -s outfile ] ; then cp outfile "$OUTPUT$reldir$file.diff" echo "Output differs: $reldir$file" @@ -98,7 +100,8 @@ for xmldir in ibm/valid/P* \ sun/invalid ; do cd "$TS/xmlconf/$xmldir" mkdir -p "$OUTPUT$xmldir" - for xmlfile in *.xml ; do + for xmlfile in $(ls -1 *.xml | sort -d) ; do + [[ -f "$xmlfile" ]] || continue RunXmlwfWF "$xmlfile" "$xmldir/" UpdateStatus $? done |