Delete vcan interfaces before every test

diff --git a/gw-tests/lib.sh b/gw-tests/lib.sh
index cacde470a1f440d1df93b0078f7720938384c8d3..003782d1019ef90d1f9535ffa10a0a5f59fed7ec 100644 (file)
--- a/gw-tests/lib.sh
+++ b/gw-tests/lib.sh
@@ -30,8 +30,6 @@ sshgw() {
 }
 
 cleanupgw() {
 }
 
 cleanupgw() {

-    # Set can interfaces up
-    sshgw 'for i in 0 1; do ip link show dev can$i|grep -q UP || ip link set can$i up type can bitrate 1000000; done'

     sshgw 'cangw -F'
 }
 
     sshgw 'cangw -F'
 }
 


@@ -84,8 +82,14 @@ _run() {
        cd $dir
        echo "Working directory: $dir"
        if [[ ! "$OPT_PLOT_ONLY" ]]; then
        cd $dir
        echo "Working directory: $dir"
        if [[ ! "$OPT_PLOT_ONLY" ]]; then

+           # Remove data from the last measurement

            rm -rf *
            rm -rf *

+            # Set can interfaces up
+           sshgw 'for i in 0 1; do ip link show dev can$i|grep -q UP || ip link set can$i up type can bitrate 1000000; done'
+            # Delete all vcan interfaces
+           sshgw 'for dev in $(ip l|grep -o vcan[^:]\\+); do ip link del dev $dev; done'

            cleanupgw
            cleanupgw

+           

            main
            cp $script .
        fi
            main
            cp $script .
        fi