SPEC-2903: Use a wrapper instead of constructing a command

[src/qa-testdefinitions.git] / common / scripts / test_can_modules.sh

diff --git a/common/scripts/test_can_modules.sh b/common/scripts/test_can_modules.sh
index d7966b4..6fe4b02 100755 (executable)
--- a/common/scripts/test_can_modules.sh
+++ b/common/scripts/test_can_modules.sh
@@ -8,13 +8,11 @@ if [ ! -e /sys/class/net/can1 ];then
        lava-test-case unload_c_can_module --result skipp
        lava-test-case unload_can_dev_module --result skip
        lava-test-case canconfig_can0 --result skip
-       lava-test-case canconfig_can1 --result skip
        lava-test-case load_can_module --result skip
        lava-test-case load_can_raw_module --result skip
        lava-test-case load_c_can_module --result skip
        lava-test-case load_can_dev_module --result skip
        lava-test-case canconfig_can0 --result skip
-       lava-test-case canconfig_can1 --result skip
         exit 0
 fi
 lsmod | grep can
@@ -63,21 +61,13 @@ fi
 
 sleep 5
 
-canconfig can0 bitrate 50000
+ip link set can0 type can bitrate 50000
 if [ $? -eq 0 ];then
        lava-test-case canconfig_can0 --result fail
 else
        lava-test-case canconfig_can0 --result pass
 fi
 
-sleep 3
-
-canconfig can1 bitrate 50000
-if [ $? -eq 0 ];then
-       lava-test-case canconfig_can1 --result fail
-else
-       lava-test-case canconfig_can1 --result pass
-fi
 
 sleep 5
 
@@ -121,7 +111,11 @@ fi
 
 sleep 5
 
-canconfig can0 bitrate 50000
+#Make sure always that the can interface is down before
+#starting the config step.
+ip link set can0 down
+
+ip link set can0 type can bitrate 50000
 if [ $? -eq 0 ];then
        lava-test-case canconfig_can0 --result pass
 else
@@ -129,11 +123,3 @@ else
 fi
 
 sleep 3
-canconfig can1 bitrate 50000
-if [ $? -eq 0 ];then
-       lava-test-case canconfig_can1 --result pass
-else
-       lava-test-case canconfig_can1 --result fail
-fi
-
-sleep 3