Fix a few bugs in scripts

diff --git a/gw-tests/lib.sh b/gw-tests/lib.sh
index 46fc5c18ce5cb0fbc036a59604ff5f67c36e6c7a..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.
@@ -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

diff --git a/gw-tests/nop-canalyzer.sh b/gw-tests/nop-canalyzer.sh
index 8f1cab7141470e8edf88919122046533c5274955..18b1fd3cf6f0b07c1c4929f99e9912b10568e34e 100755 (executable)
--- a/gw-tests/nop-canalyzer.sh
+++ b/gw-tests/nop-canalyzer.sh
@@ -9,7 +9,7 @@ wait_for_key() {
 }
 
 main() {
-    if ! [ "$INTERACTIVE" ]; then echo "Skipping interactive test $0"; exit 0; fi
+    if ! [ "$INTERACTIVE" ]; then echo "Skipping interactive test $0"; return; fi
 
     sshgw cangw -A -s can0 -d can1
     latester -d can0 -d can1 -d can2 -c $COUNT $(traffic_and_length 2) -n len2