Merge branch 'master' of rtime.felk.cvut.cz:/can-benchmark

[can-benchmark.git] / gw-tests / lib.sh

diff --git a/gw-tests/lib.sh b/gw-tests/lib.sh
index 8cf99e98d7ae52b54d9630daa62adb10423ebec5..4bc522b6441605262cb35692f3a798ccf6be7180 100644 (file)
--- a/gw-tests/lib.sh
+++ b/gw-tests/lib.sh
@@ -33,7 +33,11 @@ PATH=$PWD/../_compiled/bin/:$PATH
 sshgw() {
     local socket="$HOME/.ssh/cangw-connection"
 
-    if [[ "$NO_GW_NEEDED" ]]; then return; fi
+    if [[ "$1" = "-f" ]]; then
+           shift
+    else
+       if [[ "$NO_GW_NEEDED" ]]; then return; fi
+    fi
 
     if [[ ! -S $socket ]] || ! ssh -x -a -S $socket root@192.168.2.3 true; then
        # Create master connection to speed up subsequenct command.
@@ -89,7 +93,7 @@ traffic_and_length() {
 start_load() {
     case $load in
        none) ;;
-       cpu) sshgw 'hackbench -g 3 -l 10000' & loadpid=$!;;
+       cpu) sshgw 'hackbench -g 3 -l 100000' & loadpid=$!;;
        eth) ping -f -s 60000 -q 192.168.2.3 & loadpid=$!;; # TODO: Generate eth load from another computer
        can) latester -q -d can1 -i 0x7ff & loadpid=$!;;
        *) error "Unknown load specification: $load"
@@ -163,7 +167,7 @@ _run() {
     else loads=${load:-$OPT_LOAD}
     fi
     hostkvers=${hostkvers:-host-$(uname -r)}
-    kvers=${kvers:-$(sshgw uname -r)}
+    kvers=${kvers:-$(sshgw -f uname -r)}
     test=$(basename $0 .sh)
     for load in $loads; do
     for traffic in $traffics; do