Follow the changes in XMLTree API: xml_tree::subtree_elements() does

[SXSI/xpathcomp.git] / tests / non_regression_tests / test.sh

diff --git a/tests/non_regression_tests/test.sh b/tests/non_regression_tests/test.sh
index f4a9106..40ddcd4 100755 (executable)
--- a/tests/non_regression_tests/test.sh
+++ b/tests/non_regression_tests/test.sh
@@ -32,13 +32,15 @@ if [ "$1" = "fast" ]
 then
     repeat_monet=1
     repeat_sxsi=1
+    repeat_qizx=2
 else
-    repeat_monet=5
-    repeat_sxsi=3
+    repeat_monet=1
+    repeat_sxsi=10
+    repeat_qizx=4
 fi
 
 
-for TESTDOC in "medline.xml" #"xmark_01.04.xml" "xmark_10.xml" 
+for TESTDOC in medline_full.xml #"xmark_10.xml"  #"medline.xml" "xmark_01.04.xml"
 do
 echo
 echo "$TESTDOC"
@@ -50,8 +52,14 @@ QLOG="$TESTDOC"_qizx.log
 rm -f "$MLOG" "$SLOG" "$QLOG"
 cat "$TESTDOC".queries | grep -v '^#' | while read line
 do
-    query=`echo "$line" | cut -f 1 -d "%"`
-    query_qizx=`echo "$line" | cut -f 2 -d "%"`
+
+    qname=`echo "$line" | cut -f 1 -d "%"`
+    query=`echo "$line" | cut -f 2 -d "%"`
+    query_qizx=`echo "$line" | cut -f 3 -d "%"`
+    if [ -z "$query_qizx" ]
+    then
+       query_qizx="$query"
+    fi
     echo Test $I "... "
     echo "$query" | sed -e 's|/descendant::|//|g' | sed -e 's|child::||g'
     echo -n Running SXSI
@@ -60,11 +68,11 @@ do
        read sxsi_mat_time
        read sxsi_print_time
        read sxsi_count
-    } < <(`pwd`/sxsi.sh "$query" "$TESTDOC" "$repeat_sxsi")
+    } < <(`pwd`/sxsi.sh "$query" "$TESTDOC" "$repeat_sxsi" "$2")
 
     echo " ok"
     echo -n Running MonetBD/XQuery
-    
+
     if [ "$query" = '/descendant::people[ descendant::person[not(child::address)] and descendant::person[not(child::watches)]]/child::person[child::watches]' ]
     then
        #Quick work around since MonetBD fails on q11
@@ -78,7 +86,7 @@ do
        read monet_mat_time
        read monet_print_time
        read monet_count
-    } < <(`pwd`/monet.sh "$query" "$TESTDOC" "$repeat_monet")
+    } < <(`pwd`/monet.sh "$query" "$TESTDOC" "$repeat_monet" "$2")
 
     fi
     echo " ok"
@@ -89,7 +97,7 @@ do
        read qizx_mat_time
        read qizx_print_time
        read qizx_count
-    } < <(`pwd`/qizx.sh "$query_qizx" "$TESTDOC")
+    } < <(`pwd`/qizx.sh "$query_qizx" "$TESTDOC" "$repeat_qizx" "$2")
 
     echo " ok"
 
@@ -110,7 +118,7 @@ do
            { read "$v"; } < <( echo 7200000 )
        fi
     done
-       
+
 
 
     echo "$I,$sxsi_count,$sxsi_count_time,$sxsi_mat_time,$sxsi_print_time" >> "$SLOG"