Make the program report query execution time and query serialization time.

[tatoo.git] / tools / do_test.sh

diff --git a/tools/do_test.sh b/tools/do_test.sh
index 05163b8..64748f4 100755 (executable)
--- 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))
@@ -34,9 +34,11 @@ do
             ;;
         *)
             echo failed
-            echo ------- output -----------
-            cat "$RESULTS"/"$qname"_test.log
-            echo --------------------------
+            # echo ------- output -----------
+            # cat "$RESULTS"/"$qname".xml
+            # echo ==========================
+            # cat "$RESULTS"/"$qname"_test.xml
+            # echo --------------------------
             ;;
     esac
 done;