Gitiles
Code Review Sign In
gerrit.openbmc.org / openbmc / openbmc / db4c27ee07165dd36a758f4ab5236918f133e65b / . / poky / meta / recipes-extended / ltp / ltp / 0001-net_stress-Fix-usage-of-variables-from-tst_net.sh.patch
blob: f747a1f97f994e949654a58d437bbe0e268e7caa [file] [log] [blame]
Patrick Williamsdb4c27e2022-08-05 08:10:29 -0500[diff] [blame^]1From 33c156e295e35d4839a135d8ba5db485b7712ced Mon Sep 17 00:00:00 2001
2From: Joerg Vehlow <joerg.vehlow@aox.de>
3Date: Mon, 27 Jun 2022 09:27:09 +0200
4Subject: [PATCH] net_stress: Fix usage of variables from tst_net.sh
5
6These tests use variables (NS_TIMES, IP_TOTAL, ROUTE_TOTAL
7and IF_UPDOWN_TIMES) from tst_net.sh, before sourcing it.
8
9Fixes: 04021637f ("tst_test.sh: Cleanup getopts usage")
10
11Reviewed-by: Petr Vorel <pvorel@suse.cz>
12Signed-off-by: Joerg Vehlow <joerg.vehlow@aox.de>
13Upstream-Status: Backport [33c156e295e35d4839a135d8ba5db485b7712ced]
14---
15 testcases/network/stress/interface/if-addr-adddel.sh | 7 ++++---
16 testcases/network/stress/interface/if-addr-addlarge.sh | 7 ++++---
17 testcases/network/stress/interface/if-route-adddel.sh | 5 +++--
18 testcases/network/stress/interface/if-route-addlarge.sh | 5 +++--
19 testcases/network/stress/interface/if-updown.sh | 5 +++--
20 testcases/network/stress/interface/if4-addr-change.sh | 4 +++-
21 6 files changed, 20 insertions(+), 13 deletions(-)
22
23diff --git a/testcases/network/stress/interface/if-addr-adddel.sh b/testcases/network/stress/interface/if-addr-adddel.sh
24index cb453e612..0750501f0 100755
25--- a/testcases/network/stress/interface/if-addr-adddel.sh
26+++ b/testcases/network/stress/interface/if-addr-adddel.sh
27@@ -7,9 +7,6 @@
28
29 IF_CMD='ifconfig'
30
31-# The interval of the check interface activity
32-CHECK_INTERVAL=${CHECK_INTERVAL:-$(($NS_TIMES / 20))}
33-
34 test_body()
35 {
36 local cmd="$CMD"
37@@ -89,4 +86,8 @@ test_body()
38 }
39
40 . if-lib.sh
41+
42+# The interval of the check interface activity
43+CHECK_INTERVAL=${CHECK_INTERVAL:-$(($NS_TIMES / 20))}
44+
45 tst_run
46diff --git a/testcases/network/stress/interface/if-addr-addlarge.sh b/testcases/network/stress/interface/if-addr-addlarge.sh
47index 3c876c17d..d0759c86b 100755
48--- a/testcases/network/stress/interface/if-addr-addlarge.sh
49+++ b/testcases/network/stress/interface/if-addr-addlarge.sh
50@@ -7,9 +7,6 @@
51
52 IF_CMD='ifconfig'
53
54-# The interval of the check interface activity
55-CHECK_INTERVAL=${CHECK_INTERVAL:-$(($IP_TOTAL / 20))}
56-
57 test_body()
58 {
59 local cmd="$CMD"
60@@ -110,4 +107,8 @@ test_body()
61 }
62
63 . if-lib.sh
64+
65+# The interval of the check interface activity
66+CHECK_INTERVAL=${CHECK_INTERVAL:-$(($IP_TOTAL / 20))}
67+
68 tst_run
69diff --git a/testcases/network/stress/interface/if-route-adddel.sh b/testcases/network/stress/interface/if-route-adddel.sh
70index b50da268a..51445e4f7 100755
71--- a/testcases/network/stress/interface/if-route-adddel.sh
72+++ b/testcases/network/stress/interface/if-route-adddel.sh
73@@ -7,8 +7,6 @@
74
75 IF_CMD='route'
76
77-CHECK_INTERVAL=${CHECK_INTERVAL:-$(($NS_TIMES / 20))}
78-
79 test_body()
80 {
81 local cmd="$CMD"
82@@ -64,4 +62,7 @@ test_body()
83 }
84
85 . if-lib.sh
86+
87+CHECK_INTERVAL=${CHECK_INTERVAL:-$(($NS_TIMES / 20))}
88+
89 tst_run
90diff --git a/testcases/network/stress/interface/if-route-addlarge.sh b/testcases/network/stress/interface/if-route-addlarge.sh
91index 7d09d1216..355b6b4ab 100755
92--- a/testcases/network/stress/interface/if-route-addlarge.sh
93+++ b/testcases/network/stress/interface/if-route-addlarge.sh
94@@ -7,8 +7,6 @@
95
96 IF_CMD='route'
97
98-CHECK_INTERVAL=${CHECK_INTERVAL:-$(($ROUTE_TOTAL / 20))}
99-
100 test_body()
101 {
102 local cmd="$CMD"
103@@ -76,4 +74,7 @@ test_body()
104 }
105
106 . if-lib.sh
107+
108+CHECK_INTERVAL=${CHECK_INTERVAL:-$(($ROUTE_TOTAL / 20))}
109+
110 tst_run
111diff --git a/testcases/network/stress/interface/if-updown.sh b/testcases/network/stress/interface/if-updown.sh
112index 9a5709c85..71c78d785 100755
113--- a/testcases/network/stress/interface/if-updown.sh
114+++ b/testcases/network/stress/interface/if-updown.sh
115@@ -8,8 +8,6 @@
116 IF_CMD='ifconfig'
117 TST_CLEANUP="if_cleanup_restore"
118
119-CHECK_INTERVAL=${CHECK_INTERVAL:-$(($IF_UPDOWN_TIMES / 20))}
120-
121 test_body()
122 {
123 local cmd="$CMD"
124@@ -47,4 +45,7 @@ test_body()
125 }
126
127 . if-lib.sh
128+
129+CHECK_INTERVAL=${CHECK_INTERVAL:-$(($IF_UPDOWN_TIMES / 20))}
130+
131 tst_run
132diff --git a/testcases/network/stress/interface/if4-addr-change.sh b/testcases/network/stress/interface/if4-addr-change.sh
133index b9ece2af9..f162e6a51 100755
134--- a/testcases/network/stress/interface/if4-addr-change.sh
135+++ b/testcases/network/stress/interface/if4-addr-change.sh
136@@ -9,7 +9,6 @@ TST_CLEANUP="do_cleanup"
137 TST_TESTFUNC="test_body"
138 TST_NEEDS_CMDS="ifconfig"
139
140-CHECK_INTERVAL=${CHECK_INTERVAL:-$(($NS_TIMES / 20))}
141 # Maximum host portion of the IPv4 address on the local host
142 LHOST_IPV4_HOST_MAX="254"
143
144@@ -61,4 +60,7 @@ test_body()
145 }
146
147 . tst_net.sh
148+
149+CHECK_INTERVAL=${CHECK_INTERVAL:-$(($NS_TIMES / 20))}
150+
151 tst_run
152--
1532.37.1
154