Main program output incorrect xml tags

Adapt test scripts so that they can be called from the project root

diff --git a/src/main.ml b/src/main.ml
index 100581e..9a5fd69 100644 (file)
--- a/src/main.ml
+++ b/src/main.ml
@@ -38,10 +38,10 @@ let () =
   fprintf err_formatter "Evaluating automaton:\n%!";
   let module Naive = Auto.Eval.Make(Tree.Naive) in
   let results = Naive.eval auto doc (Tree.Naive.root doc) in
   fprintf err_formatter "Evaluating automaton:\n%!";
   let module Naive = Auto.Eval.Make(Tree.Naive) in
   let results = Naive.eval auto doc (Tree.Naive.root doc) in

-  output_string stdout "<xml_results>\n";
+  output_string stdout "<xml_result>\n";

   List.iter (fun n ->
     Tree.Naive.print_xml stdout doc n;
     output_char stdout '\n'
   ) results;
   List.iter (fun n ->
     Tree.Naive.print_xml stdout doc n;
     output_char stdout '\n'
   ) results;

-  output_string stdout "\n<xml_results>";
+  output_string stdout "</xml_result>\n";

   flush stdout
   flush stdout

diff --git a/tools/do_test.sh b/tools/do_test.sh
index 05163b8..8e87cf0 100755 (executable)
--- a/tools/do_test.sh
+++ b/tools/do_test.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 #!/bin/sh
 

-TESTPROG="../main.native"
+TESTPROG="./main.native"

 
 usage() {
     echo "error: missing input, query file, xml_diff or $TESTPROG"
 
 usage() {
     echo "error: missing input, query file, xml_diff or $TESTPROG"


@@ -11,7 +11,7 @@ FILE="$1"
 RESULTS="$FILE".results
 QUERIES="$FILE".queries
 
 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
 then
    usage;
    exit 1


@@ -25,8 +25,8 @@ while read qname q
 do
     TOTAL=$(($TOTAL + 1))
     echo -n "Testing $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))
     case "$?" in
         0)
             TESTS=$(($TESTS + 1))


@@ -35,7 +35,9 @@ do
         *)
             echo failed
             echo ------- output -----------
         *)
             echo failed
             echo ------- output -----------

-            cat "$RESULTS"/"$qname"_test.log
+            cat "$RESULTS"/"$qname".xml
+            echo ==========================
+            cat "$RESULTS"/"$qname"_test.xml

             echo --------------------------
             ;;
     esac
             echo --------------------------
             ;;
     esac

diff --git a/tools/gen_test.sh b/tools/gen_test.sh
index 3e5a34f..b55a701 100755 (executable)
--- a/tools/gen_test.sh
+++ b/tools/gen_test.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 usage() {
 #!/bin/sh
 
 usage() {

-    echo "error: missing input, query file or XPathEval class"
+    echo "error: missing input, query file"

     echo "usage: $0 file.xml"
 }
 
     echo "usage: $0 file.xml"
 }
 


@@ -9,7 +9,7 @@ FILE="$1"
 RESULTS="$FILE".results
 QUERIES="$FILE".queries
 
 RESULTS="$FILE".results
 QUERIES="$FILE".queries
 

-if test ! -f "$FILE" -o ! -f "$QUERIES" -o ! -f XPathEval.class
+if test ! -f "$FILE" -o ! -f "$QUERIES"

 then
    usage;
    exit 1
 then
    usage;
    exit 1


@@ -21,5 +21,5 @@ mkdir -p "$RESULTS"
 cat "$QUERIES" | grep -v '^#' | while read qname q
 do
     echo "Computing $q"
 cat "$QUERIES" | grep -v '^#' | while read qname q
 do
     echo "Computing $q"

-    java XPathEval "$FILE" "$q" > "$RESULTS"/"$qname".xml
+    java -cp _build/tools XPathEval "$FILE" "$q" > "$RESULTS"/"$qname".xml

 done
 done