From 665d6da4926723b2f2e3a59ba27f614c6ba5cf34 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Kim=20Nguy=E1=BB=85n?= <kn@lri.fr>
Date: Wed, 14 Mar 2012 15:32:49 +0100
Subject: [PATCH] Fix test scripts.

---
 tests/non_regression_tests/qizx.sh            |  2 +-
 tests/non_regression_tests/test.sh            | 24 +++++++++----------
 .../xmark_all.xml.queries                     | 22 ++++++++---------
 3 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/tests/non_regression_tests/qizx.sh b/tests/non_regression_tests/qizx.sh
index 8de0697..d9f56dd 100755
--- a/tests/non_regression_tests/qizx.sh
+++ b/tests/non_regression_tests/qizx.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-QIZX="./alarm 600 22000000 /raid0/kn/qizx/qizx-fe-4.1p1/bin/qizx"
+QIZX="/usr/local/bin/alarm 600 22000000 /raid0/kn/qizx/qizx-fe-4.1p1/bin/qizx"
 
 function do_qizx() {
     
diff --git a/tests/non_regression_tests/test.sh b/tests/non_regression_tests/test.sh
index f4a9106..dc75a4e 100755
--- a/tests/non_regression_tests/test.sh
+++ b/tests/non_regression_tests/test.sh
@@ -38,7 +38,7 @@ else
 fi
 
 
-for TESTDOC in "medline.xml" #"xmark_01.04.xml" "xmark_10.xml" 
+for TESTDOC in "xmark_10.xml"  #"medline.xml" "xmark_01.04.xml"
 do
 echo
 echo "$TESTDOC"
@@ -64,7 +64,7 @@ do
 
     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
@@ -83,15 +83,15 @@ do
     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")
+#
+#   echo " ok"
 
     if [ "$monet_count" = "" ]
     then
@@ -110,7 +110,7 @@ do
 	    { read "$v"; } < <( echo 7200000 )
 	fi
     done
-	
+
 
 
     echo "$I,$sxsi_count,$sxsi_count_time,$sxsi_mat_time,$sxsi_print_time" >> "$SLOG"
diff --git a/tests/non_regression_tests/xmark_all.xml.queries b/tests/non_regression_tests/xmark_all.xml.queries
index 33dc145..73d4a2a 100644
--- a/tests/non_regression_tests/xmark_all.xml.queries
+++ b/tests/non_regression_tests/xmark_all.xml.queries
@@ -1,10 +1,10 @@
 /child::site/child::regions
-#/child::site/child::closed_auctions
+/child::site/child::closed_auctions
 /child::site/child::regions/child::*/child::item
 /child::site/child::closed_auctions/child::closed_auction/child::annotation/child::description/child::text/child::keyword
 /descendant::listitem/descendant::keyword
-#/descendant::closed_auction/descendant::keyword
-#/site/closed_auctions/closed_auction/descendant::keyword
+/descendant::closed_auction/descendant::keyword
+/site/closed_auctions/closed_auction/descendant::keyword
 /child::site/child::closed_auctions/child::closed_auction[child::annotation/child::description/child::text/child::keyword]/child::date
 /child::site/child::closed_auctions/child::closed_auction[descendant::keyword]/child::date
 /child::site/child::people/child::person[child::profile/child::gender and child::profile/child::age]/child::name
@@ -13,16 +13,16 @@
 /descendant::listitem[not(descendant::keyword/child::emph)]/descendant::parlist
 /descendant::listitem[ (descendant::keyword or descendant::emph) and (descendant::emph or descendant::bold)]/child::parlist
 /descendant::people[ descendant::person[not(child::address)] and descendant::person[not(child::watches)]]/child::person[child::watches]
-#/site/regions/europe/item/mailbox/mail/text/keyword
-#/site/closed_auctions/closed_auction/annotation/description/parlist/listitem
-#/site/closed_auctions/closed_auction/annotation/description/parlist/listitem/parlist/listitem/*/descendant::keyword
-#/site/regions/*/item/descendant::keyword
-#/site/regions/*/person[ address and (phone or homepage) ]
-#/descendant::listitem[ descendant::keyword and descendant::emph]/descendant::parlist
-#/site/regions/*/item[ mailbox/mail/date ]/mailbox/mail
+/site/regions/europe/item/mailbox/mail/text/keyword
+/site/closed_auctions/closed_auction/annotation/description/parlist/listitem
+/site/closed_auctions/closed_auction/annotation/description/parlist/listitem/parlist/listitem/*/descendant::keyword
+/site/regions/*/item/descendant::keyword
+/site/regions/*/person[ address and (phone or homepage) ]
+/descendant::listitem[ descendant::keyword and descendant::emph]/descendant::parlist
+/site/regions/*/item[ mailbox/mail/date ]/mailbox/mail
 /child::*[ descendant::* ]
 /descendant::*
 /descendant::*/descendant::*
 /descendant::*/descendant::*/descendant::*
 /descendant::*/descendant::*/descendant::*/descendant::*
-#/descendant::*/descendant::*/descendant::*/descendant::*/descendant::*/descendant::*/descendant::*/descendant::*
+/descendant::*/descendant::*/descendant::*/descendant::*/descendant::*/descendant::*/descendant::*/descendant::*
-- 
2.17.1