aboutsummaryrefslogtreecommitdiffstats
path: root/tests/xmltest.sh
diff options
context:
space:
mode:
Diffstat (limited to 'tests/xmltest.sh')
-rwxr-xr-xtests/xmltest.sh17
1 files changed, 6 insertions, 11 deletions
diff --git a/tests/xmltest.sh b/tests/xmltest.sh
index 2b8cb196b385..9b5003511430 100755
--- a/tests/xmltest.sh
+++ b/tests/xmltest.sh
@@ -22,17 +22,16 @@
shopt -s nullglob
+# Note: OUTPUT must terminate with the directory separator.
+OUTPUT="$PWD/tests/out/"
+TS="$PWD/tests/"
+
MYDIR="`dirname \"$0\"`"
cd "$MYDIR"
MYDIR="`pwd`"
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"
+DIFF="${MYDIR}/udiffer.py"
# RunXmlwfNotWF file reldir
@@ -40,9 +39,7 @@ DIFF="$TS/udiffer.py"
RunXmlwfNotWF() {
file="$1"
reldir="$2"
- $XMLWF -p "$file" > outfile || return $?
- read outdata < outfile
- if test "$outdata" = "" ; then
+ if $XMLWF -p "$file" > /dev/null; then
echo "Expected not well-formed: $reldir$file"
return 1
else
@@ -133,7 +130,6 @@ for xmldir in ibm/not-wf/P* \
RunXmlwfNotWF "$xmlfile" "$xmldir/"
UpdateStatus $?
done
- rm outfile
done
cd "$TS/xmlconf/oasis"
@@ -141,7 +137,6 @@ for xmlfile in *fail*.xml ; do
RunXmlwfNotWF "$xmlfile" "oasis/"
UpdateStatus $?
done
-rm outfile
echo "Passed: $SUCCESS"
echo "Failed: $ERROR"