Commit d4e19272 authored by Matthieu Baerts (NGI0)'s avatar Matthieu Baerts (NGI0) Committed by Jakub Kicinski

selftests: mptcp: reset the last TS before the first test

Just to slightly improve the precision of the duration of the first
test.

In mptcp_join.sh, the last append_prev_results is now done as soon as
the last test is over: this will add the last result in the list, and
get a more precise time for this last test.
Reviewed-by: default avatarMat Martineau <martineau@kernel.org>
Signed-off-by: default avatarMatthieu Baerts (NGI0) <matttbe@kernel.org>
Link: https://patch.msgid.link/20240906-net-next-mptcp-ksft-subtest-time-v2-3-31d5ee4f3bdf@kernel.orgSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 1a38cee4
...@@ -847,6 +847,8 @@ stop_if_error() ...@@ -847,6 +847,8 @@ stop_if_error()
make_file "$cin" "client" make_file "$cin" "client"
make_file "$sin" "server" make_file "$sin" "server"
mptcp_lib_subtests_last_ts_reset
check_mptcp_disabled check_mptcp_disabled
stop_if_error "The kernel configuration is not valid for MPTCP" stop_if_error "The kernel configuration is not valid for MPTCP"
......
...@@ -3959,9 +3959,11 @@ if [ ${#tests[@]} -eq 0 ]; then ...@@ -3959,9 +3959,11 @@ if [ ${#tests[@]} -eq 0 ]; then
tests=("${all_tests_names[@]}") tests=("${all_tests_names[@]}")
fi fi
mptcp_lib_subtests_last_ts_reset
for subtests in "${tests[@]}"; do for subtests in "${tests[@]}"; do
"${subtests}" "${subtests}"
done done
append_prev_results
if [ ${ret} -ne 0 ]; then if [ ${ret} -ne 0 ]; then
echo echo
...@@ -3972,7 +3974,6 @@ if [ ${ret} -ne 0 ]; then ...@@ -3972,7 +3974,6 @@ if [ ${ret} -ne 0 ]; then
echo echo
fi fi
append_prev_results
mptcp_lib_result_print_all_tap mptcp_lib_result_print_all_tap
exit $ret exit $ret
...@@ -349,6 +349,7 @@ init ...@@ -349,6 +349,7 @@ init
make_file "$cin" "client" 1 make_file "$cin" "client" 1
make_file "$sin" "server" 1 make_file "$sin" "server" 1
trap cleanup EXIT trap cleanup EXIT
mptcp_lib_subtests_last_ts_reset
run_tests $ns1 $ns2 10.0.1.1 run_tests $ns1 $ns2 10.0.1.1
run_tests $ns1 $ns2 dead:beef:1::1 run_tests $ns1 $ns2 dead:beef:1::1
......
...@@ -137,6 +137,8 @@ check() ...@@ -137,6 +137,8 @@ check()
fi fi
} }
mptcp_lib_subtests_last_ts_reset
check "show_endpoints" "" "defaults addr list" check "show_endpoints" "" "defaults addr list"
default_limits="$(get_limits)" default_limits="$(get_limits)"
......
...@@ -286,6 +286,7 @@ while getopts "bcdhi" option;do ...@@ -286,6 +286,7 @@ while getopts "bcdhi" option;do
done done
setup setup
mptcp_lib_subtests_last_ts_reset
run_test 10 10 0 0 "balanced bwidth" run_test 10 10 0 0 "balanced bwidth"
run_test 10 10 1 25 "balanced bwidth with unbalanced delay" run_test 10 10 1 25 "balanced bwidth with unbalanced delay"
......
...@@ -150,6 +150,7 @@ mptcp_lib_events "${ns2}" "${client_evts}" client_evts_pid ...@@ -150,6 +150,7 @@ mptcp_lib_events "${ns2}" "${client_evts}" client_evts_pid
server_evts=$(mktemp) server_evts=$(mktemp)
mptcp_lib_events "${ns1}" "${server_evts}" server_evts_pid mptcp_lib_events "${ns1}" "${server_evts}" server_evts_pid
sleep 0.5 sleep 0.5
mptcp_lib_subtests_last_ts_reset
print_title "Init" print_title "Init"
print_test "Created network namespaces ns1, ns2" print_test "Created network namespaces ns1, ns2"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment