Only create plot.sh if test is not skipped

diff --git a/gw-tests/lib.sh b/gw-tests/lib.sh
index 4bc522b6441605262cb35692f3a798ccf6be7180..5df4598cb9cf4148cb9957e5ef7ab2766c5dbff9 100644 (file)
--- a/gw-tests/lib.sh
+++ b/gw-tests/lib.sh
@@ -142,9 +142,10 @@ _measure() {
        kill_load
     fi
 
-    # Create a plot script at the end to signalize that the
-    # measurement was successfully finished
-    cat > plot.sh <<-EOF
+    if [ ! "$SKIPPED" ]; then
+        # Create a plot script at the end to signalize that the
+        # measurement was successfully finished
+       cat > plot.sh <<-EOF
        #!/bin/bash
        export kvers=$kvers
        export hostkvers=$hostkvers
@@ -153,7 +154,8 @@ _measure() {
        cd \$(dirname \$0)/$(dirname $script)
        exec ./$(basename $script) --plot "\$@"
        EOF
-    chmod +x plot.sh
+       chmod +x plot.sh
+    fi
 }
 
 

diff --git a/gw-tests/nop-canalyzer.sh b/gw-tests/nop-canalyzer.sh
index 18b1fd3cf6f0b07c1c4929f99e9912b10568e34e..4028cf2cacc0caedbbd7775ec6fb2cdb2dc3733d 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"; return; fi
+    if ! [ "$INTERACTIVE" ]; then echo "Skipping interactive test $0"; SKIPPED=1; return; fi
 
     sshgw cangw -A -s can0 -d can1
     latester -d can0 -d can1 -d can2 -c $COUNT $(traffic_and_length 2) -n len2