Test cleanup

diff --git a/gw-tests/filter-sff.sh b/gw-tests/filter-sff.sh
index 53383768cf3b18724a6ef25bf86a18e22e140dff..f0fe0a88ae07c61bdc73df5b79d694ea3846ed49 100755 (executable)
--- 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 757f328107ef1436c048f31fcb8e6711a08b07a1..183ab1b8c7e6f451f4c5cb1979337b7a6c3a1927 100755 (executable)
--- 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 003782d1019ef90d1f9535ffa10a0a5f59fed7ec..aa05a26b0cc0768af78c9ee9ea7cb6b082bbe573 100644 (file)
--- 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 5d3ffe572b403b5869c7293aab704b6c7d247ad7..7d01e8297494299e631912ae64c38b508250ab2c 100755 (executable)
--- 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
 }