Skip to content

Commit c2a4d27

Browse files
Cypresslindavem330
Cypresslin
authored and
davem330
committed
selftests: rtnetlink: correct the final return value for the test
The return value "ret" will be reset to 0 from the beginning of each sub-test in rtnetlink.sh, therefore this test will always pass if the last sub-test has passed: $ sudo ./rtnetlink.sh PASS: policy routing PASS: route get PASS: preferred_lft addresses have expired PASS: promote_secondaries complete PASS: tc htb hierarchy PASS: gre tunnel endpoint PASS: gretap PASS: ip6gretap PASS: erspan PASS: ip6erspan PASS: bridge setup PASS: ipv6 addrlabel PASS: set ifalias a39ee707-e36b-41d3-802f-63179ed4d580 for test-dummy0 PASS: vrf PASS: vxlan FAIL: can't add fou port 7777, skipping test PASS: macsec PASS: ipsec 3,7c3,7 < sa[0] spi=0x00000009 proto=0x32 salt=0x64636261 crypt=1 < sa[0] key=0x31323334 35363738 39303132 33343536 < sa[1] rx ipaddr=0x00000000 00000000 00000000 c0a87b03 < sa[1] spi=0x00000009 proto=0x32 salt=0x64636261 crypt=1 < sa[1] key=0x31323334 35363738 39303132 33343536 --- > sa[0] spi=0x00000009 proto=0x32 salt=0x61626364 crypt=1 > sa[0] key=0x34333231 38373635 32313039 36353433 > sa[1] rx ipaddr=0x00000000 00000000 00000000 037ba8c0 > sa[1] spi=0x00000009 proto=0x32 salt=0x61626364 crypt=1 > sa[1] key=0x34333231 38373635 32313039 36353433 FAIL: ipsec_offload incorrect driver data FAIL: ipsec_offload PASS: bridge fdb get PASS: neigh get $ echo $? 0 Make "ret" become a local variable for all sub-tests. Also, check the sub-test results in kci_test_rtnl() and return the final result for this test. Signed-off-by: Po-Hsu Lin <po-hsu.lin@canonical.com> Signed-off-by: David S. Miller <davem@davemloft.net>
1 parent 0b0e299 commit c2a4d27

1 file changed

Lines changed: 43 additions & 22 deletions

File tree

‎tools/testing/selftests/net/rtnetlink.sh‎

Lines changed: 43 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
# set -e
66

77
devdummy="test-dummy0"
8-
ret=0
98

109
# Kselftest framework requirement - SKIP code is 4.
1110
ksft_skip=4
@@ -66,7 +65,7 @@ kci_test_bridge()
6665
devbr="test-br0"
6766
vlandev="testbr-vlan1"
6867

69-
ret=0
68+
local ret=0
7069
ip link add name "$devbr" type bridge
7170
check_err $?
7271

@@ -113,7 +112,7 @@ kci_test_gre()
113112
rem=10.42.42.1
114113
loc=10.0.0.1
115114

116-
ret=0
115+
local ret=0
117116
ip tunnel add $gredev mode gre remote $rem local $loc ttl 1
118117
check_err $?
119118
ip link set $gredev up
@@ -149,7 +148,7 @@ kci_test_gre()
149148
kci_test_tc()
150149
{
151150
dev=lo
152-
ret=0
151+
local ret=0
153152

154153
tc qdisc add dev "$dev" root handle 1: htb
155154
check_err $?
@@ -184,7 +183,7 @@ kci_test_tc()
184183

185184
kci_test_polrouting()
186185
{
187-
ret=0
186+
local ret=0
188187
ip rule add fwmark 1 lookup 100
189188
check_err $?
190189
ip route add local 0.0.0.0/0 dev lo table 100
@@ -207,7 +206,7 @@ kci_test_route_get()
207206
{
208207
local hash_policy=$(sysctl -n net.ipv4.fib_multipath_hash_policy)
209208

210-
ret=0
209+
local ret=0
211210

212211
ip route get 127.0.0.1 > /dev/null
213212
check_err $?
@@ -290,7 +289,7 @@ kci_test_promote_secondaries()
290289

291290
kci_test_addrlabel()
292291
{
293-
ret=0
292+
local ret=0
294293

295294
ip addrlabel add prefix dead::/64 dev lo label 1
296295
check_err $?
@@ -330,7 +329,7 @@ kci_test_addrlabel()
330329

331330
kci_test_ifalias()
332331
{
333-
ret=0
332+
local ret=0
334333
namewant=$(uuidgen)
335334
syspathname="/sys/class/net/$devdummy/ifalias"
336335

@@ -385,7 +384,7 @@ kci_test_ifalias()
385384
kci_test_vrf()
386385
{
387386
vrfname="test-vrf"
388-
ret=0
387+
local ret=0
389388

390389
ip link show type vrf 2>/dev/null
391390
if [ $? -ne 0 ]; then
@@ -425,7 +424,7 @@ kci_test_vrf()
425424

426425
kci_test_encap_vxlan()
427426
{
428-
ret=0
427+
local ret=0
429428
vxlan="test-vxlan0"
430429
vlan="test-vlan0"
431430
testns="$1"
@@ -511,7 +510,7 @@ kci_test_encap_vxlan()
511510

512511
kci_test_encap_fou()
513512
{
514-
ret=0
513+
local ret=0
515514
name="test-fou"
516515
testns="$1"
517516

@@ -548,7 +547,7 @@ kci_test_encap_fou()
548547
kci_test_encap()
549548
{
550549
testns="testns"
551-
ret=0
550+
local ret=0
552551

553552
ip netns add "$testns"
554553
if [ $? -ne 0 ]; then
@@ -573,7 +572,7 @@ kci_test_encap()
573572
kci_test_macsec()
574573
{
575574
msname="test_macsec0"
576-
ret=0
575+
local ret=0
577576

578577
ip macsec help 2>&1 | grep -q "^Usage: ip macsec"
579578
if [ $? -ne 0 ]; then
@@ -631,7 +630,7 @@ kci_test_macsec()
631630
#-------------------------------------------------------------------
632631
kci_test_ipsec()
633632
{
634-
ret=0
633+
local ret=0
635634
algo="aead rfc4106(gcm(aes)) 0x3132333435363738393031323334353664636261 128"
636635
srcip=192.168.123.1
637636
dstip=192.168.123.2
@@ -731,7 +730,7 @@ kci_test_ipsec()
731730
#-------------------------------------------------------------------
732731
kci_test_ipsec_offload()
733732
{
734-
ret=0
733+
local ret=0
735734
algo="aead rfc4106(gcm(aes)) 0x3132333435363738393031323334353664636261 128"
736735
srcip=192.168.123.3
737736
dstip=192.168.123.4
@@ -841,7 +840,7 @@ kci_test_gretap()
841840
{
842841
testns="testns"
843842
DEV_NS=gretap00
844-
ret=0
843+
local ret=0
845844

846845
ip netns add "$testns"
847846
if [ $? -ne 0 ]; then
@@ -891,7 +890,7 @@ kci_test_ip6gretap()
891890
{
892891
testns="testns"
893892
DEV_NS=ip6gretap00
894-
ret=0
893+
local ret=0
895894

896895
ip netns add "$testns"
897896
if [ $? -ne 0 ]; then
@@ -941,7 +940,7 @@ kci_test_erspan()
941940
{
942941
testns="testns"
943942
DEV_NS=erspan00
944-
ret=0
943+
local ret=0
945944

946945
ip link help erspan 2>&1 | grep -q "^Usage:"
947946
if [ $? -ne 0 ];then
@@ -1006,7 +1005,7 @@ kci_test_ip6erspan()
10061005
{
10071006
testns="testns"
10081007
DEV_NS=ip6erspan00
1009-
ret=0
1008+
local ret=0
10101009

10111010
ip link help ip6erspan 2>&1 | grep -q "^Usage:"
10121011
if [ $? -ne 0 ];then
@@ -1077,7 +1076,7 @@ kci_test_fdb_get()
10771076
test_mac=de:ad:be:ef:13:37
10781077
localip="10.0.2.2"
10791078
dstip="10.0.2.3"
1080-
ret=0
1079+
local ret=0
10811080

10821081
bridge fdb help 2>&1 |grep -q 'bridge fdb get'
10831082
if [ $? -ne 0 ];then
@@ -1125,7 +1124,7 @@ kci_test_neigh_get()
11251124
dstmac=de:ad:be:ef:13:37
11261125
dstip=10.0.2.4
11271126
dstip6=dead::2
1128-
ret=0
1127+
local ret=0
11291128

11301129
ip neigh help 2>&1 |grep -q 'ip neigh get'
11311130
if [ $? -ne 0 ];then
@@ -1175,34 +1174,56 @@ kci_test_neigh_get()
11751174

11761175
kci_test_rtnl()
11771176
{
1177+
local ret=0
11781178
kci_add_dummy
11791179
if [ $ret -ne 0 ];then
11801180
echo "FAIL: cannot add dummy interface"
11811181
return 1
11821182
fi
11831183

11841184
kci_test_polrouting
1185+
check_err $?
11851186
kci_test_route_get
1187+
check_err $?
11861188
kci_test_addrlft
1189+
check_err $?
11871190
kci_test_promote_secondaries
1191+
check_err $?
11881192
kci_test_tc
1193+
check_err $?
11891194
kci_test_gre
1195+
check_err $?
11901196
kci_test_gretap
1197+
check_err $?
11911198
kci_test_ip6gretap
1199+
check_err $?
11921200
kci_test_erspan
1201+
check_err $?
11931202
kci_test_ip6erspan
1203+
check_err $?
11941204
kci_test_bridge
1205+
check_err $?
11951206
kci_test_addrlabel
1207+
check_err $?
11961208
kci_test_ifalias
1209+
check_err $?
11971210
kci_test_vrf
1211+
check_err $?
11981212
kci_test_encap
1213+
check_err $?
11991214
kci_test_macsec
1215+
check_err $?
12001216
kci_test_ipsec
1217+
check_err $?
12011218
kci_test_ipsec_offload
1219+
check_err $?
12021220
kci_test_fdb_get
1221+
check_err $?
12031222
kci_test_neigh_get
1223+
check_err $?
12041224

12051225
kci_del_dummy
1226+
return $ret
12061227
}
12071228

12081229
#check for needed privileges
@@ -1221,4 +1242,4 @@ done
12211242

12221243
kci_test_rtnl
12231244

1224-
exit $ret
1245+
exit $?

0 commit comments

Comments
 (0)