net_stress: Fix usage of variables from tst_net.sh
PATCH 1/1 net_stress: Fix usage of variables from tst_net.sh
From: Joerg Vehlow <[email protected]>
These tests use variables (NS_TIMES, IP_TOTAL, ROUTE_TOTAL and IF_UPDOWN_TIMES) from tst_net.sh, before sourcing it.
Fixes 04021637f4749a4797bf105862c45fe07374a161 ("tst_test.sh: Cleanup getopts usage")
Signed-off-by Joerg Vehlow <[email protected]>
--- testcases/network/stress/interface/if-addr-adddel.sh | 7 ++++--- testcases/network/stress/interface/if-addr-addlarge.sh | 7 ++++--- testcases/network/stress/interface/if-route-adddel.sh | 5 +++-- testcases/network/stress/interface/if-route-addlarge.sh | 5 +++-- testcases/network/stress/interface/if-updown.sh | 5 +++-- testcases/network/stress/interface/if4-addr-change.sh | 4 +++- 6 files changed, 20 insertions(+), 13 deletions(-)
testcases/network/stress/interface/if-addr-adddel.sh +4 -3
@@ -7,9 +7,6 @@ IF_CMD='ifconfig' -# The interval of the check interface activity -CHECK_INTERVAL=${CHECK_INTERVAL:-$(($NS_TIMES / 20))} - test_body() { local cmd="$CMD"
@@ -89,4 +86,8 @@ test_body() } . if-lib.sh + +# The interval of the check interface activity +CHECK_INTERVAL=${CHECK_INTERVAL:-$(($NS_TIMES / 20))} + tst_run
testcases/network/stress/interface/if-addr-addlarge.sh +4 -3
@@ -7,9 +7,6 @@ IF_CMD='ifconfig' -# The interval of the check interface activity -CHECK_INTERVAL=${CHECK_INTERVAL:-$(($IP_TOTAL / 20))} - test_body() { local cmd="$CMD"
@@ -110,4 +107,8 @@ test_body() } . if-lib.sh + +# The interval of the check interface activity +CHECK_INTERVAL=${CHECK_INTERVAL:-$(($IP_TOTAL / 20))} + tst_run
testcases/network/stress/interface/if-route-adddel.sh +3 -2
@@ -7,8 +7,6 @@ IF_CMD='route' -CHECK_INTERVAL=${CHECK_INTERVAL:-$(($NS_TIMES / 20))} - test_body() { local cmd="$CMD"
@@ -64,4 +62,7 @@ test_body() } . if-lib.sh + +CHECK_INTERVAL=${CHECK_INTERVAL:-$(($NS_TIMES / 20))} + tst_run
testcases/network/stress/interface/if-route-addlarge.sh +3 -2
@@ -7,8 +7,6 @@ IF_CMD='route' -CHECK_INTERVAL=${CHECK_INTERVAL:-$(($ROUTE_TOTAL / 20))} - test_body() { local cmd="$CMD"
@@ -76,4 +74,7 @@ test_body() } . if-lib.sh + +CHECK_INTERVAL=${CHECK_INTERVAL:-$(($ROUTE_TOTAL / 20))} + tst_run
testcases/network/stress/interface/if-updown.sh +3 -2
@@ -8,8 +8,6 @@ IF_CMD='ifconfig' TST_CLEANUP="if_cleanup_restore" -CHECK_INTERVAL=${CHECK_INTERVAL:-$(($IF_UPDOWN_TIMES / 20))} - test_body() { local cmd="$CMD"
@@ -47,4 +45,7 @@ test_body() } . if-lib.sh + +CHECK_INTERVAL=${CHECK_INTERVAL:-$(($IF_UPDOWN_TIMES / 20))} + tst_run
testcases/network/stress/interface/if4-addr-change.sh +3 -1
@@ -9,7 +9,6 @@ TST_CLEANUP="do_cleanup" TST_TESTFUNC="test_body" TST_NEEDS_CMDS="ifconfig" -CHECK_INTERVAL=${CHECK_INTERVAL:-$(($NS_TIMES / 20))} # Maximum host portion of the IPv4 address on the local host LHOST_IPV4_HOST_MAX="254"
@@ -61,4 +60,7 @@ test_body() } . tst_net.sh + +CHECK_INTERVAL=${CHECK_INTERVAL:-$(($NS_TIMES / 20))} + tst_run
Signature · 5 lines
2.25.1 -- Mailing list info: https://lists.linux.it/listinfo/ltp
Hi Petr,
did you miss this patch (and the other one for memcg/functional with the same type of bug)?
Joerg
Am 6/27/2022 um 9:27 AM schrieb Joerg Vehlow:
Quoted 145 lines
From: Joerg Vehlow <[email protected]>
These tests use variables (
NS_TIMES,IP_TOTAL,ROUTE_TOTALandIF_UPDOWN_TIMES) fromtst_net.sh, before sourcing it.Fixes 04021637f4749a4797bf105862c45fe07374a161 ("tst_test.sh: Cleanup getopts usage")Signed-off-by Joerg Vehlow <[email protected]>--- testcases/network/stress/interface/if-addr-adddel.sh | 7 ++++--- testcases/network/stress/interface/if-addr-addlarge.sh | 7 ++++--- testcases/network/stress/interface/if-route-adddel.sh | 5 +++-- testcases/network/stress/interface/if-route-addlarge.sh | 5 +++-- testcases/network/stress/interface/if-updown.sh | 5 +++-- testcases/network/stress/interface/if4-addr-change.sh | 4 +++- 6 files changed, 20 insertions(+), 13 deletions(-)testcases/network/stress/interface/if-addr-adddel.sh +4
-3@@ -7,9 +7,6 @@ IF_CMD='ifconfig' -# The interval of the check interface activity -CHECK_INTERVAL=${CHECK_INTERVAL:-$(($NS_TIMES / 20))} - test_body() { local cmd="$CMD"@@ -89,4 +86,8 @@ test_body() } . if-lib.sh + +# The interval of the check interface activity +CHECK_INTERVAL=${CHECK_INTERVAL:-$(($NS_TIMES / 20))} + tst_runtestcases/network/stress/interface/if-addr-addlarge.sh +4
-3@@ -7,9 +7,6 @@ IF_CMD='ifconfig' -# The interval of the check interface activity -CHECK_INTERVAL=${CHECK_INTERVAL:-$(($IP_TOTAL / 20))} - test_body() { local cmd="$CMD"@@ -110,4 +107,8 @@ test_body() } . if-lib.sh + +# The interval of the check interface activity +CHECK_INTERVAL=${CHECK_INTERVAL:-$(($IP_TOTAL / 20))} + tst_runtestcases/network/stress/interface/if-route-adddel.sh +3
-2@@ -7,8 +7,6 @@ IF_CMD='route' -CHECK_INTERVAL=${CHECK_INTERVAL:-$(($NS_TIMES / 20))} - test_body() { local cmd="$CMD"@@ -64,4 +62,7 @@ test_body() } . if-lib.sh + +CHECK_INTERVAL=${CHECK_INTERVAL:-$(($NS_TIMES / 20))} + tst_runtestcases/network/stress/interface/if-route-addlarge.sh +3
-2@@ -7,8 +7,6 @@ IF_CMD='route' -CHECK_INTERVAL=${CHECK_INTERVAL:-$(($ROUTE_TOTAL / 20))} - test_body() { local cmd="$CMD"@@ -76,4 +74,7 @@ test_body() } . if-lib.sh + +CHECK_INTERVAL=${CHECK_INTERVAL:-$(($ROUTE_TOTAL / 20))} + tst_runtestcases/network/stress/interface/if-updown.sh +3
-2@@ -8,8 +8,6 @@ IF_CMD='ifconfig' TST_CLEANUP="if_cleanup_restore" -CHECK_INTERVAL=${CHECK_INTERVAL:-$(($IF_UPDOWN_TIMES / 20))} - test_body() { local cmd="$CMD"@@ -47,4 +45,7 @@ test_body() } . if-lib.sh + +CHECK_INTERVAL=${CHECK_INTERVAL:-$(($IF_UPDOWN_TIMES / 20))} + tst_runtestcases/network/stress/interface/if4-addr-change.sh +3
-1@@ -9,7 +9,6 @@ TST_CLEANUP="do_cleanup" TST_TESTFUNC="test_body" TST_NEEDS_CMDS="ifconfig" -CHECK_INTERVAL=${CHECK_INTERVAL:-$(($NS_TIMES / 20))} # Maximum host portion of the IPv4 address on the local host LHOST_IPV4_HOST_MAX="254"@@ -61,4 +60,7 @@ test_body() } . tst_net.sh + +CHECK_INTERVAL=${CHECK_INTERVAL:-$(($NS_TIMES / 20))} + tst_run
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp
Hi Joerg,
Quoted 4 lines
Hi Petr,
did you miss this patch (and the other one for memcg/functional with the same type of bug)?
Thanks for ping and the patches, I indeed overlook them. Both fixes merged.
Kind regards,
Petr
Quoted 1 line
Joerg
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp