X-Git-Url: http://git.nguyen.vg/gitweb/?p=tatoo.git;a=blobdiff_plain;f=tools%2Fdo_test.sh;h=8e87cf09347ce31eebab77fe0619a47c046b04df;hp=05163b86898c043dad2f34ca2e345663577dc701;hb=398d3e07fa7a472395fa125f504c11629ec601ad;hpb=20538a1c949f89745b73f89f9d0c146dc42454a2

diff --git a/tools/do_test.sh b/tools/do_test.sh
index 05163b8..8e87cf0 100755
--- a/tools/do_test.sh
+++ b/tools/do_test.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-TESTPROG="../main.native"
+TESTPROG="./main.native"
 
 usage() {
     echo "error: missing input, query file, xml_diff or $TESTPROG"
@@ -11,7 +11,7 @@ FILE="$1"
 RESULTS="$FILE".results
 QUERIES="$FILE".queries
 
-if test ! -f "$FILE" -o ! -f "$QUERIES" -o ! -f "$TESTPROG" -o ! -f xml_diff
+if test ! -f "$FILE" -o ! -f "$QUERIES" -o ! -f "$TESTPROG" -o ! -f xml_diff.native
 then
    usage;
    exit 1
@@ -25,8 +25,8 @@ while read qname q
 do
     TOTAL=$(($TOTAL + 1))
     echo -n "Testing $qname: $q ... "
-    "$TESTROG" "$FILE" "$q" > "$RESULTS"/"$qname"_test.xml 2> "$RESULTS"/"$qname"_test.log
-    ./xml_diff "$RESULTS"/"$qname"_test.xml "$RESULTS"/"$qname".xml 2>> "$RESULTS"/"$qname"_test.log
+    "$TESTPROG" "$FILE" "$q" > "$RESULTS"/"$qname"_test.xml  2> "$RESULTS"/"$qname"_test.log
+    ./xml_diff.native "$RESULTS"/"$qname"_test.xml "$RESULTS"/"$qname".xml 2>> "$RESULTS"/"$qname"_test.log
     case "$?" in
         0)
             TESTS=$(($TESTS + 1))
@@ -35,7 +35,9 @@ do
         *)
             echo failed
             echo ------- output -----------
-            cat "$RESULTS"/"$qname"_test.log
+            cat "$RESULTS"/"$qname".xml
+            echo ==========================
+            cat "$RESULTS"/"$qname"_test.xml
             echo --------------------------
             ;;
     esac