From 20b3deb1d2a53e85261e1db2d30ff1a7140be018 Mon Sep 17 00:00:00 2001
From: Michal Sojka <sojkam1@fel.cvut.cz>
Date: Wed, 1 Dec 2010 13:59:00 +0100
Subject: [PATCH] Test cleanup

---
 gw-tests/filter-sff.sh | 5 ++---
 gw-tests/filter.sh     | 2 +-
 gw-tests/lib.sh        | 4 +++-
 gw-tests/vcan.sh       | 4 ----
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/gw-tests/filter-sff.sh b/gw-tests/filter-sff.sh
index 5338376..f0fe0a8 100755
--- a/gw-tests/filter-sff.sh
+++ b/gw-tests/filter-sff.sh
@@ -13,7 +13,7 @@ main() {
 
 plot_cmds() {
     cat <<EOF
-set title "Single GW, no modifications, 2048 filters (one per id)"
+set title "Single GW, no modifications, 2048 filters (one per id, mask C00007FF)"
 set logscale y
 set grid
 set xlabel "Time [{/Symbol m}s]"
@@ -22,8 +22,7 @@ plot [0:1500] [1:$COUNT] \\
 EOF
     lt=1
     for i in $ids; do
-	(( i != 0)) && echo ", \\"
-	echo -n "    " \"hist-$i.dat\" with lp lt $lt title \"Message id $i\"
+	echo_plot "\"hist-$i.dat\" with lp lt $lt title \"Message id $i\""
         lt=$((lt+1))
     done
     echo
diff --git a/gw-tests/filter.sh b/gw-tests/filter.sh
index 757f328..183ab1b 100755
--- a/gw-tests/filter.sh
+++ b/gw-tests/filter.sh
@@ -2,7 +2,7 @@
 
 . lib.sh
 
-ids=$(seq 0 256 2047)
+ids="0 $(seq 255 256 2047)"
 
 main() {
     sshgw 'for i in `seq 0 2047`; do cangw -A -s can0 -d can1 -f $(printf %x $i):7ff; done'
diff --git a/gw-tests/lib.sh b/gw-tests/lib.sh
index 003782d..aa05a26 100644
--- a/gw-tests/lib.sh
+++ b/gw-tests/lib.sh
@@ -93,7 +93,9 @@ _run() {
 	    main
 	    cp $script .
 	fi
-	_plot
+	if [[ ! "$OPT_PLOT_DISABLE" ]]; then
+	    _plot
+	fi
     done
 }
 
diff --git a/gw-tests/vcan.sh b/gw-tests/vcan.sh
index 5d3ffe5..7d01e82 100755
--- a/gw-tests/vcan.sh
+++ b/gw-tests/vcan.sh
@@ -15,10 +15,6 @@ main() {
 	sshgw cangw -A -s vcan0 -d can1 -f $(printf %x:C00007FF $i)
 
 	latester -d can0 -d can1 -d can2 -o -c $COUNT -i 0 -h hist-$i.dat -f time-$i.dat
-
-	echo
-	sshgw cangw -L
-
     done
     sshgw ip link del dev vcan0
 }
-- 
2.39.2