Rework test scripts

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

diff --git a/tests/non_regression_tests/sxsi.sh b/tests/non_regression_tests/sxsi.sh
index f1948ea..0ef26c4 100755 (executable)
--- a/tests/non_regression_tests/sxsi.sh
+++ b/tests/non_regression_tests/sxsi.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+source utils.sh
+
 function do_sxsi() {
     query="$1"
     doc=`basename "$2" .xml`.srx
@@ -8,20 +10,20 @@ function do_sxsi() {
     TIME_COUNT=""
     TIME_PRINT=""
     NUM_RESULTS=""
-    output=`./main.native -v -c -b "$doc" "$query" 2>&1`
+    output=`./main.native -r "$3" -c -b "$doc" "$query" 2>&1`
     echo "$output" >> sxsi_debug.log
-    NUM_RESULT=`echo "$output" | grep "Number of nodes " | grep -o '[0-9]*'`
-    time=`echo "$output" | grep "Execution time" | cut -f 2 -d',' | grep -o '[0-9.]*'`
-    TIME_COUNT=`echo "$time" | sort -g | head -1`
+    NUM_RESULT=`echo "$output" | grep "Number of results" | grep -o '[0-9]*'`
+    time=`echo "$output" | grep "Execution time" | cut -f 2 -d',' | cut -f1 -d ':' | grep -o '[0-9.]*'`
+    TIME_COUNT=`echo "$time" | tail -n +2 | average`
 
-    output=`./main.native -b "$doc" "$query" /dev/null 2>&1`
-    mtime=`echo "$output" | grep "Execution time" | cut -f 2 -d',' | grep -o '[0-9.]*'`
-    ptime=`echo "$output" | grep "Serializing" | grep -o '[0-9.]*'`
-    TIME_MAT=`echo "$mtime" | sort -g | head -1`
+    output=`./main.native -b -r "$3" "$doc" "$query" /dev/null 2>&1`
+    mtime=`echo "$output" | grep "Execution time" | cut -f 2 -d',' | cut -f1 -d ':'| grep -o '[0-9.]*'`
+    ptime=`echo "$output" | grep 'Serialization time' | cut -f 3 -d ' ' | grep -o '[0-9.]*'`
+    TIME_MAT=`echo "$mtime" | tail -n +2 | average`
     TIME_PRINT="$ptime"
 
-    echo "$TIME_COUNT" 
-    echo "$TIME_MAT" 
+    echo "$TIME_COUNT"
+    echo "$TIME_MAT"
     echo "$TIME_PRINT"
     echo $NUM_RESULT
 }