From: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
Date: Thu, 28 Nov 2019 15:06:15 +0000 (+0000)
Subject: Merge "SPEC-2996: handle rcar_can"
X-Git-Tag: 8.99.2~3
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=3745cee489b181d3860f87ff1995353eddb456b0;hp=77e208ad5e1b21868c3369a93b5460f568d9e6f7;p=src%2Fqa-testdefinitions.git

Merge "SPEC-2996: handle rcar_can"
---

diff --git a/common/scripts/test_can_loopback_mode.sh b/common/scripts/test_can_loopback_mode.sh
index 4f4ae76..96b1091 100755
--- a/common/scripts/test_can_loopback_mode.sh
+++ b/common/scripts/test_can_loopback_mode.sh
@@ -15,9 +15,10 @@ fi
 
 sleep 2
 set -x
-ip -V | grep -q -i BusyBox
+ip -V 2>&1 | grep -q -i BusyBox
+RET=$?
 set +x
-if [ $? -eq 0 ];then
+if [ $RET -eq 0 ];then
 	echo "WARN: busybox ip is not handled"
 	# busybox ip does not handle bitrate option
 	skip_tests
diff --git a/common/scripts/test_can_modules.sh b/common/scripts/test_can_modules.sh
index 2a16897..1a46034 100755
--- a/common/scripts/test_can_modules.sh
+++ b/common/scripts/test_can_modules.sh
@@ -58,7 +58,7 @@ fi
 
 remove_module can_dev
 
-ip -V | grep -q -i BusyBox
+ip -V 2>&1 | grep -q -i BusyBox
 if [ $? -eq 0 ];then
 	lava-test-case canconfig_can0 --result skip
 else
@@ -88,7 +88,7 @@ fi
 #starting the config step.
 ip link set can0 down
 
-ip -V | grep -q -i BusyBox
+ip -V 2>&1 | grep -q -i BusyBox
 if [ $? -eq 0 ];then
 	lava-test-case canconfig_can0 --result skip
 else