Skip to contentSkip to conversation

net/ip_tests: Return TCONF if driver dummy not present

PATCH New Kory Maincent 2 participants 2 messages Dec 1, 2020

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 net/ip_tests: Return TCONF if driver dummy not present

---

Changes since v1:
- Use TST_NEEDS_DRIVERS
- Test ip4_addr before clean to avoid empty grep

 testcases/network/iproute/ip_tests.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
testcases/network/iproute/ip_tests.sh +2 -1
index 41c515696..13722afb9 100755
@@ -13,6 +13,7 @@ TST_CLEANUP="cleanup"
 TST_NEEDS_TMPDIR=1
 TST_NEEDS_ROOT=1
 TST_NEEDS_CMDS="cat awk diff"
+TST_NEEDS_DRIVERS="dummy"
 
 . tst_net.sh
 
@@ -51,7 +52,7 @@ cleanup()
 	[ "$rm_dummy" ] && modprobe -r dummy
 
 	# test #5
-	ip route show | grep $ip4_addr && ip route del $ip4_addr
+	[ "$ip4_addr" ] && ip route show | grep $ip4_addr && ip route del $ip4_addr
 }
 
 test1()
Signature · 1 line
2.17.1
#1 lore raw

PATCH v2 1/1 net/ip_tests: Return TCONF if driver dummy not present

Hi Kory, Alexey,

...

testcases/network/iproute/ip_tests.sh cleanup() · line 55

Quoted 3 lines
testcases/network/iproute/ip_tests.sh +1 -1
 	# test #5
-	ip route show | grep $ip4_addr && ip route del $ip4_addr
+	[ "$ip4_addr" ] && ip route show | grep $ip4_addr && ip route del $ip4_addr

Added -q to grep and merged.

Thanks for your patch!
Alexey, thanks for review!

Kind regards,
Petr