X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=common%2Fscripts%2Ftest_can_modules.sh;h=3b317afd4f39078dabfe455eb222b0e92ed275f3;hb=f820cb32ee5d7edb1f3c0ad8198805ba79e63b7b;hp=12e82eeb559c3a4c7e5141525262b934844e5604;hpb=4b263fd3625dbb9a2f30c77bbd8e49bde0bca967;p=src%2Fqa-testdefinitions.git

diff --git a/common/scripts/test_can_modules.sh b/common/scripts/test_can_modules.sh
index 12e82ee..3b317af 100755
--- a/common/scripts/test_can_modules.sh
+++ b/common/scripts/test_can_modules.sh
@@ -8,137 +8,84 @@ 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
-if [ $? -eq 0 ];then
-	lava-test-case show_can_modules --result pass
-else
-	lava-test-case show_can_modules --result fail
-fi
-
-sleep 4
-
-rmmod can_raw
-if [ $? -eq 0 ];then
-	lava-test-case unload_can_raw_module --result pass
-else
-	lava-test-case unload_can_raw_module --result fail
-fi
-
-rmmod can
-if [ $? -eq 0 ];then
-	lava-test-case unload_can_module --result pass
-else
-	lava-test-case unload_can_module --result fail
-fi
 
-rmmod c_can_platform
-if [ $? -eq 0 ];then
-	lava-test-case unload_c_can_platform_module --result pass
-else
-	lava-test-case unload_c_can_platform_module --result fail
-fi
-
-rmmod c_can
-if [ $? -eq 0 ];then
-	lava-test-case unload_c_can_module --result pass
-else
-	lava-test-case unload_c_can_module --result fail
-fi
+# remove module "$1"
+remove_module() {
+	lsmod | grep -q "^$1[[:space:]]"
+	if [ $? -ne 0 ];then
+		lava-test-case unload_$1_module --result skip
+		return 0
+	fi
+	rmmod $1
+	if [ $? -eq 0 ];then
+		lava-test-case unload_$1_module --result pass
+	else
+		lava-test-case unload_$1_module --result fail
+	fi
+}
 
-rmmod can_dev
-if [ $? -eq 0 ];then
-	lava-test-case unload_can_dev_module --result pass
-else
-	lava-test-case unload_can_dev_module --result fail
-fi
+modprobe_module() {
+	modprobe $1
+	if [ $? -eq 0 ];then
+		lava-test-case load_$1_module --result pass
+	else
+		lava-test-case load_$1_module --result fail
+	fi
+}
 
-sleep 5
+remove_module can_raw
 
-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
+remove_module can
 
-sleep 3
+remove_module c_can_platform
 
-ip link set can1 type can bitrate 50000
-if [ $? -eq 0 ];then
-	lava-test-case canconfig_can1 --result fail
-else
-	lava-test-case canconfig_can1 --result pass
-fi
+remove_module c_can
 
-sleep 5
+remove_module can_dev unload_can_dev_module
 
-modprobe can
+ip -V 2>&1 | grep -q -i BusyBox
 if [ $? -eq 0 ];then
-	lava-test-case load_can_module --result pass
+	lava-test-case canconfig_can0 --result skip
 else
-	lava-test-case load_can_module --result fail
+	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
 fi
 
-modprobe can_raw
-x=$?
-sleep 5
-if [ $x -eq 0 ];then
-	lava-test-case load_can_raw_module --result pass
-else
-	lava-test-case load_can_raw_module --result fail
-fi
-sleep 3
+modprobe_module can
 
-modprobe c_can
-if [ $? -eq 0 ];then
-	lava-test-case load_c_can_module --result pass
-else
-	lava-test-case load_c_can_module --result fail
-fi
+modprobe_module can_raw
 
-modprobe c_can_platform
-if [ $? -eq 0 ];then
-	lava-test-case load_c_can_platform_module --result pass
-else
-	lava-test-case load_c_can_platform_module --result fail
-fi
+modprobe_module c_can
 
-modprobe can_dev
-if [ $? -eq 0 ];then
-	lava-test-case load_can_dev_module --result pass
-else
-	lava-test-case load_can_dev_module --result fail
-fi
+modprobe_module c_can_platform
 
-sleep 5
+modprobe_module can_dev
 
 #Make sure always that the can interface is down before
 #starting the config step.
 ip link set can0 down
-ip link set can1 down
 
-ip link set can0 type can bitrate 50000
+ip -V 2>&1 | grep -q -i BusyBox
 if [ $? -eq 0 ];then
-	lava-test-case canconfig_can0 --result pass
-else
-	lava-test-case canconfig_can0 --result fail
-fi
-
-sleep 3
-ip link set can1 type can bitrate 50000
-if [ $? -eq 0 ];then
-	lava-test-case canconfig_can1 --result pass
+	lava-test-case canconfig_can0 --result skip
 else
-	lava-test-case canconfig_can1 --result fail
+	ip link set can0 type can bitrate 50000
+	if [ $? -eq 0 ];then
+		lava-test-case canconfig_can0 --result pass
+	else
+		lava-test-case canconfig_can0 --result fail
+	fi
 fi
 
 sleep 3