X-Git-Url: http://git.nguyen.vg/gitweb/?a=blobdiff_plain;f=tests%2Fnon_regression_tests%2Ftest.sh;h=40ddcd4be6cf5f99c7749a2e5938d9ca218794ac;hb=refs%2Fheads%2Ftrack-xml-tree-better-doc;hp=dc75a4ed2dc7ce1e165a2c18e3a77b17943397be;hpb=665d6da4926723b2f2e3a59ba27f614c6ba5cf34;p=SXSI%2Fxpathcomp.git

diff --git a/tests/non_regression_tests/test.sh b/tests/non_regression_tests/test.sh
index dc75a4e..40ddcd4 100755
--- 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 "xmark_10.xml"  #"medline.xml" "xmark_01.04.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,7 +68,7 @@ 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
@@ -78,20 +86,20 @@ 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"
 
-# echo -n Running Qizx/XQuery
-# {
-#	read qizx_count_time
-#	read qizx_mat_time
-#	read qizx_print_time
-#	read qizx_count
-#   } < <(`pwd`/qizx.sh "$query_qizx" "$TESTDOC")
-#
-#   echo " ok"
+    echo -n Running Qizx/XQuery
+    {
+	read qizx_count_time
+	read qizx_mat_time
+	read qizx_print_time
+	read qizx_count
+    } < <(`pwd`/qizx.sh "$query_qizx" "$TESTDOC" "$repeat_qizx" "$2")
+
+    echo " ok"
 
     if [ "$monet_count" = "" ]
     then