iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

selftests: mptcp: add mptcp_lib_make_file

Browse Source 
To avoid duplicated code in different MPTCP selftests, we can add
and use helpers defined in mptcp_lib.sh.

make_file() helper in mptcp_sockopt.sh and userspace_pm.sh are the same.
Export it into mptcp_lib.sh and rename it as mptcp_lib_kill_wait(). Use
it in both mptcp_connect.sh and mptcp_join.sh.

Reviewed-by: Matthieu Baerts <matttbe@kernel.org>
Signed-off-by: Geliang Tang <geliang.tang@suse.com>
Signed-off-by: Mat Martineau <martineau@kernel.org>
Link: https://lore.kernel.org/r/20231128-send-net-next-2023107-v4-13-8d6b94150f6b@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Geliang Tang 2023-11-28 15:18:57 -08:00 committed by Jakub Kicinski
parent 119931cc88
commit 3a96dea9f8
5 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tools/testing/selftests/net/mptcp/mptcp_connect.sh
View File

@ -592,9 +592,8 @@ make_file()
ksize=$((SIZE / 1024))
rem=$((SIZE - (ksize * 1024)))
dd if=/dev/urandom of="$name" bs=1024 count=$ksize 2> /dev/null
mptcp_lib_make_file $name 1024 $ksize
dd if=/dev/urandom conv=notrunc of="$name" oflag=append bs=1 count=$rem 2> /dev/null
echo -e "\nMPTCP_TEST_FILE_END_MARKER" >> "$name"
echo "Created $name (size $(du -b "$name")) containing data sent by $who"
}

3
tools/testing/selftests/net/mptcp/mptcp_join.sh
View File

@ -1171,8 +1171,7 @@ make_file()
local who=$2
local size=$3
dd if=/dev/urandom of="$name" bs=1024 count=$size 2> /dev/null
echo -e "\nMPTCP_TEST_FILE_END_MARKER" >> "$name"
mptcp_lib_make_file $name 1024 $size
print_info "Test file (size $size KB) for $who"
}

9
tools/testing/selftests/net/mptcp/mptcp_lib.sh
View File

@ -247,3 +247,12 @@ mptcp_lib_get_counter() {
echo "${count}"
}
mptcp_lib_make_file() {
local name="${1}"
local bs="${2}"
local size="${3}"
dd if=/dev/urandom of="${name}" bs="${bs}" count="${size}" 2> /dev/null
echo -e "\nMPTCP_TEST_FILE_END_MARKER" >> "${name}"
}

3
tools/testing/selftests/net/mptcp/mptcp_sockopt.sh
View File

@ -251,8 +251,7 @@ make_file()
local who=$2
local size=$3
dd if=/dev/urandom of="$name" bs=1024 count=$size 2> /dev/null
echo -e "\nMPTCP_TEST_FILE_END_MARKER" >> "$name"
mptcp_lib_make_file $name 1024 $size
echo "Created $name (size $size KB) containing data sent by $who"
}

12
tools/testing/selftests/net/mptcp/userspace_pm.sh
View File

@ -164,22 +164,12 @@ print_title "Init"
print_test "Created network namespaces ns1, ns2"
test_pass
make_file()
{
# Store a chunk of data in a file to transmit over an MPTCP connection
local name=$1
local ksize=1
dd if=/dev/urandom of="$name" bs=2 count=$ksize 2> /dev/null
echo -e "\nMPTCP_TEST_FILE_END_MARKER" >> "$name"
}
make_connection()
{
if [ -z "$file" ]; then
file=$(mktemp)
fi
make_file "$file" "client"
mptcp_lib_make_file "$file" 2 1
local is_v6=$1
local app_port=$app4_port