Rework test scripts

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

diff --git a/tests/non_regression_tests/monet.sh b/tests/non_regression_tests/monet.sh
index db76444..d1e2c35 100755 (executable)
--- a/tests/non_regression_tests/monet.sh
+++ b/tests/non_regression_tests/monet.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-
+source utils.sh
 #Mserver and killall must be in /etc/sudoers
 function kmonet() {
     sudo killall -TERM Mserver
@@ -11,7 +11,7 @@ trap kmonet INT TERM
 function do_monet(){
     while pidof Mserver >/dev/null
     do
-       
+
        sudo killall -TERM Mserver
        sleep 3
     done
@@ -44,8 +44,8 @@ function do_monet(){
     } < <(echo "fn:count(fn:doc(\"$doc\")$query)
 " | mclient -t --interactive 2>&1 | grep -o '[0-9.]*' )
 
-    TIME_COUNT="$tquery
-$TIME_COUNT"
+    TIME_COUNT="$TIME_COUNT
+$tquery"
 
     NUM_RESULTS="$num"
     done
@@ -62,24 +62,24 @@ $TIME_COUNT"
 fn:doc(\"$doc\")$query
 " | mclient -t --interactive 2>&1 | grep -o '[0-9.]*' )
 
-    TIME_MAT="$tquery
-$TIME_MAT"
+    TIME_MAT="$TIME_MAT
+$tquery"
 
-    TIME_PRINT="$tprint
-$TIME_PRINT"
+    TIME_PRINT="$TIME_PRINT
+$tprint"
 
     done
 
     while pidof Mserver >/dev/null
     do
-       
+
        sudo killall -TERM Mserver
        sleep 3
     done
 
-    echo "$TIME_COUNT" | sort -g | head -2 | tail -1
-    echo "$TIME_MAT" | sort -g | head -2 | tail -1
-    echo "$TIME_PRINT" | sort -g | head -2 | tail -1
+    echo "$TIME_COUNT" | tail -n +2 | average
+    echo "$TIME_MAT" | tail -n +2   | average
+    echo "$TIME_PRINT" | tail -n +2   | average
     echo $NUM_RESULTS
 }