From: Michal Sojka <sojkam1@fel.cvut.cz>
Date: Tue, 20 Sep 2011 22:24:51 +0000 (+0200)
Subject: Only create plot.sh if test is not skipped
X-Git-Tag: fix-allnoconfig~184
X-Git-Url: http://rtime.felk.cvut.cz/gitweb/can-benchmark.git/commitdiff_plain/5c61beffdb88002b3296c079188ffdb794f96149

Only create plot.sh if test is not skipped
---

diff --git a/gw-tests/lib.sh b/gw-tests/lib.sh
index 4bc522b..5df4598 100644
--- 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 18b1fd3..4028cf2 100755
--- 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