From nobody Tue May 14 15:20:17 2024 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B4D8C12B167 for ; Thu, 7 Mar 2024 12:48:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709815739; cv=none; b=uJdun3TNuOU892kUzAd1smFLdcOUBF1HpGum/xWAu4X5TwK6yfm9TTVTKrCExKGc/0mCntKpjW1+akGLdOcsLPeWCNBEY2sQ7jAve/Y1WyesCrcBdW1mV3hXKsIJ/YxqkrS939dLIooNdb2Ck42JOD0if0iFpMBHbGkGXd4Ygis= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709815739; c=relaxed/simple; bh=uIRLvHX3CjoY4bl58xEBR8R3aWju+Vt9JOog6WBhVxo=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=dIjm5OHDaYigTaesSChZuwh9mkzLUrmKMcWcsidswtLZ6eOostTglFFi9OYfISWO88lQIeGIKAD2dH+oRm46SnZ6bC8LmMFmIfXrYGpk4Gbm694DrKUj0R1Ljdx73XDN7GBWICIT9V1LactiGyZyUOWFyqD+zwOf1jjPYeMh2VU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=hoZYUIo3; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="hoZYUIo3" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 21A3EC433F1; Thu, 7 Mar 2024 12:48:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1709815739; bh=uIRLvHX3CjoY4bl58xEBR8R3aWju+Vt9JOog6WBhVxo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hoZYUIo3TSZFxfIm8W29+c43HEoO5pyWjUY4131f49HMm0jLyqRlcoqGqLoXfCcNq fF5N3W70rFtHUiynYCBhaUu9poEaDvCEIlAWAkwCsbcj6jzFHVobHUU2qrxl1WT8us RVJYBWQngImyeCgveJ43FpkJgfqtzfnVuZXjRcjZfmoruhENP1rhyLMwCKJOr6Urbh KTJyN/bSs6HiYJZ28Td0PtxDiIF3QKqSHgvf3t6vKbPd4PxiRQ0sCrqQH+1bgi0YIk vxPT5td0svN7+15MJVhI94gDS0k8HguyPqhVWi6ug3J1cSr3IKzPS9gBQ96dp3/ckk RpbjeHoqCExnQ== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next 1/5] selftests: mptcp: extract mptcp_lib_check_expected Date: Thu, 7 Mar 2024 20:48:40 +0800 Message-Id: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Geliang Tang Extract the main part of check_expected() in userspace_pm.sh to a new function mptcp_lib_check_expected() in mptcp_lib.sh. It will be used in both mptcp_john.sh and userspace_pm.sh. check_expected_one() is moved into mptcp_lib.sh too as mptcp_lib_check_expected_one(). Signed-off-by: Geliang Tang --- .../testing/selftests/net/mptcp/mptcp_lib.sh | 30 ++++++++++++++++ .../selftests/net/mptcp/userspace_pm.sh | 34 +++---------------- 2 files changed, 35 insertions(+), 29 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_lib.sh b/tools/testing= /selftests/net/mptcp/mptcp_lib.sh index ea39392c68e7..44491f18ed17 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_lib.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_lib.sh @@ -438,3 +438,33 @@ mptcp_lib_print_title() { # shellcheck disable=3DSC2059 # the format is in a variable printf "${MPTCP_LIB_TEST_FORMAT}" "$((++MPTCP_LIB_TEST_COUNTER))" "${*}" } + +# $1: var name ; $2: prev ret +mptcp_lib_check_expected_one() { + local var=3D"${1}" + local exp=3D"e_${var}" + local prev_ret=3D"${2}" + + if [ "${!var}" =3D "${!exp}" ]; then + return 0 + fi + + if [ "${prev_ret}" =3D "0" ]; then + mptcp_lib_pr_fail + fi + + mptcp_lib_print_err "Expected value for '${var}': '${!exp}', got '${!var}= '." + return 1 +} + +# $@: all var names to check +mptcp_lib_check_expected() { + local rc=3D0 + local var + + for var in "${@}"; do + mptcp_lib_check_expected_one "${var}" "${rc}" || rc=3D1 + done + + return "${rc}" +} diff --git a/tools/testing/selftests/net/mptcp/userspace_pm.sh b/tools/test= ing/selftests/net/mptcp/userspace_pm.sh index 4e29aa9c2529..6ab9efda8627 100755 --- a/tools/testing/selftests/net/mptcp/userspace_pm.sh +++ b/tools/testing/selftests/net/mptcp/userspace_pm.sh @@ -5,7 +5,7 @@ # code but we accept it. #shellcheck disable=3DSC2086 =20 -# Some variables are used below but indirectly, see check_expected_one() +# Some variables are used below but indirectly, see verify_*_event() #shellcheck disable=3DSC2034 =20 . "$(dirname "${0}")/mptcp_lib.sh" @@ -225,44 +225,20 @@ make_connection() fi } =20 -# $1: var name ; $2: prev ret -check_expected_one() -{ - local var=3D"${1}" - local exp=3D"e_${var}" - local prev_ret=3D"${2}" - - if [ "${!var}" =3D "${!exp}" ] - then - return 0 - fi - - if [ "${prev_ret}" =3D "0" ] - then - test_fail - fi - - mptcp_lib_print_err "\tExpected value for '${var}': '${!exp}', got '${!va= r}'." - return 1 -} - # $@: all var names to check check_expected() { local rc=3D0 - local var =20 - for var in "${@}" - do - check_expected_one "${var}" "${rc}" || rc=3D1 - done - - if [ ${rc} -eq 0 ] + mptcp_lib_check_expected "${@}" || rc=3D1 + if [ "${rc}" -eq 0 ] then test_pass return 0 fi =20 + ret=3D1 + mptcp_lib_result_fail "${test_name}" return 1 } =20 --=20 2.40.1 From nobody Tue May 14 15:20:17 2024 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5168F12B167 for ; Thu, 7 Mar 2024 12:49:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709815741; cv=none; b=I7/oU6PwMw83cAQY+5ay05NM+/A/FTYiUdWyFPe8XK5w2NugpXnGO20EWxW9YIj6Nlg1Stb36IGN8q/q89oHjhhNjfDS/AFg3rmEkt4WKVKZjF1n4ZiRODBY0hUw23m9U3+1ZTeI7GO3B+RcXIwMs83oPCYPLUycEy3CQEK8QRo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709815741; c=relaxed/simple; bh=4eyl/dB4bwjfNf+rHDQV11kMa4aCbQG6rLZv4xB1bbA=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=XzHL5E0ms3yEVr09GHfzapGPrHYq4ZPCCJe3vCVOic0DQLFAZUdjzSd8HOeZrfUX6Xmw7feKXQ6JiNrLTuH7Q+VToBgbeZc0zaElca9lQY5++MDTSeMK3XYY5E0/4Zm587rEtpXfg1Z8NYgvzT5VY8rJRbdqZz8X/UfuKFwOB1w= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=L3Ohn8xb; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="L3Ohn8xb" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 04E7AC433C7; Thu, 7 Mar 2024 12:48:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1709815741; bh=4eyl/dB4bwjfNf+rHDQV11kMa4aCbQG6rLZv4xB1bbA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=L3Ohn8xb440Rlxe+GrxzBwKqghRD8gHqcsfGEbG9yXTOXO02Nmec4JLMpwLAXugJr 5MRKGCV2E5R/3+KbpCKNZ8kySzmXXwGNgka9mSFYHewqBeDDg61xLEAr/6dVDY5es+ /ABCAUQ1gEaMSPqsBns4pOmVeuo/1JN25XkVRq9BYXJQvHHtmTRevMZrg+EEU8iJpI aoWpbqnd3vfGdmULXBylPCTHet37Vy7IvSHuSIuF7+hb2Fcpc0l69caMqJb93xLKCk Up6HgzOB8WlScLJhTY5RNn9850D9h3CFvgCq0c9LVUoGoAcSfL2SMDPBGyMDvpJBtP n5W1t+Ms7gbYA== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next 2/5] selftests: mptcp: add mptcp_lib_verify_listener_events Date: Thu, 7 Mar 2024 20:48:41 +0800 Message-Id: <85bb025586bf9f9a185e9b1c0ec21fff16626b20.1709815545.git.tanggeliang@kylinos.cn> X-Mailer: git-send-email 2.40.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Geliang Tang To avoid duplicated code in different MPTCP selftests, we can add and use helpers defined in mptcp_lib.sh. The helper verify_listener_events() is defined both in mptcp_join.sh and userspace_pm.sh, export it into mptcp_lib.sh and rename it with mptcp_lib_ prefix. Use this new helper in both scripts. Signed-off-by: Geliang Tang --- .../testing/selftests/net/mptcp/mptcp_join.sh | 23 +++----------- .../testing/selftests/net/mptcp/mptcp_lib.sh | 26 ++++++++++++++++ .../selftests/net/mptcp/userspace_pm.sh | 31 +++++-------------- 3 files changed, 38 insertions(+), 42 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index cecf09d14f46..f28b10a61268 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -2792,16 +2792,12 @@ AF_INET6=3D10 =20 verify_listener_events() { - local evt=3D$1 local e_type=3D$2 local e_family=3D$3 local e_saddr=3D$4 local e_sport=3D$5 - local type - local family - local saddr - local sport local name + local rc=3D0 =20 if [ $e_type =3D $LISTENER_CREATED ]; then name=3D"LISTENER_CREATED" @@ -2818,23 +2814,12 @@ verify_listener_events() return fi =20 - type=3D$(mptcp_lib_evts_get_info type "$evt" "$e_type") - family=3D$(mptcp_lib_evts_get_info family "$evt" "$e_type") - sport=3D$(mptcp_lib_evts_get_info sport "$evt" "$e_type") - if [ $family ] && [ $family =3D $AF_INET6 ]; then - saddr=3D$(mptcp_lib_evts_get_info saddr6 "$evt" "$e_type") - else - saddr=3D$(mptcp_lib_evts_get_info saddr4 "$evt" "$e_type") - fi - - if [ $type ] && [ $type =3D $e_type ] && - [ $family ] && [ $family =3D $e_family ] && - [ $saddr ] && [ $saddr =3D $e_saddr ] && - [ $sport ] && [ $sport =3D $e_sport ]; then + mptcp_lib_verify_listener_events "${@}" || rc=3D"${?}" + if [ "${rc}" -eq 0 ]; then print_ok return 0 fi - fail_test "$e_type:$type $e_family:$family $e_saddr:$saddr $e_sport:$spor= t" + fail_test "$e_type $e_family $e_saddr $e_sport" } =20 add_addr_ports_tests() diff --git a/tools/testing/selftests/net/mptcp/mptcp_lib.sh b/tools/testing= /selftests/net/mptcp/mptcp_lib.sh index 44491f18ed17..aefe4db47656 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_lib.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_lib.sh @@ -468,3 +468,29 @@ mptcp_lib_check_expected() { =20 return "${rc}" } + +# shellcheck disable=3DSC2034 +mptcp_lib_verify_listener_events() { + local evt=3D$1 + local e_type=3D$2 + local e_family=3D$3 + local e_saddr=3D$4 + local e_sport=3D$5 + local type + local family + local saddr + local sport + local rc=3D0 + + type=3D$(mptcp_lib_evts_get_info type "$evt" "$e_type") + family=3D$(mptcp_lib_evts_get_info family "$evt" "$e_type") + if [ "$family" ] && [ "$family" =3D "$AF_INET6" ]; then + saddr=3D$(mptcp_lib_evts_get_info saddr6 "$evt" "$e_type") + else + saddr=3D$(mptcp_lib_evts_get_info saddr4 "$evt" "$e_type") + fi + sport=3D$(mptcp_lib_evts_get_info sport "$evt" "$e_type") + + mptcp_lib_check_expected "type" "family" "saddr" "sport" || rc=3D"${?}" + return "${rc}" +} diff --git a/tools/testing/selftests/net/mptcp/userspace_pm.sh b/tools/test= ing/selftests/net/mptcp/userspace_pm.sh index 6ab9efda8627..28669e49de80 100755 --- a/tools/testing/selftests/net/mptcp/userspace_pm.sh +++ b/tools/testing/selftests/net/mptcp/userspace_pm.sh @@ -836,32 +836,15 @@ test_prio() =20 verify_listener_events() { - local evt=3D$1 - local e_type=3D$2 - local e_family=3D$3 - local e_saddr=3D$4 - local e_sport=3D$5 - local type - local family - local saddr - local sport - - if [ $e_type =3D $LISTENER_CREATED ]; then - print_test "CREATE_LISTENER $e_saddr:$e_sport" - elif [ $e_type =3D $LISTENER_CLOSED ]; then - print_test "CLOSE_LISTENER $e_saddr:$e_sport" - fi + local rc=3D0 =20 - type=3D$(mptcp_lib_evts_get_info type $evt $e_type) - family=3D$(mptcp_lib_evts_get_info family $evt $e_type) - sport=3D$(mptcp_lib_evts_get_info sport $evt $e_type) - if [ $family ] && [ $family =3D $AF_INET6 ]; then - saddr=3D$(mptcp_lib_evts_get_info saddr6 $evt $e_type) + mptcp_lib_verify_listener_events "${@}" || rc=3D"${?}" + if [ "${rc}" -eq 0 ]; then + test_pass else - saddr=3D$(mptcp_lib_evts_get_info saddr4 $evt $e_type) + ret=3D1 + mptcp_lib_result_fail "${test_name}" fi - - check_expected "type" "family" "saddr" "sport" } =20 test_listener() @@ -877,6 +860,7 @@ test_listener() # Capture events on the network namespace running the client :>$client_evts =20 + print_test "Listener event LISTENER_CREATED 10.0.2.2:$client4_port" # Attempt to add a listener at 10.0.2.2: ip netns exec $ns2 ./pm_nl_ctl listen 10.0.2.2\ $client4_port & @@ -895,6 +879,7 @@ test_listener() rport $client4_port token $server4_token sleep 0.5 =20 + print_test "Listener event LISTENER_CLOSED 10.0.2.2:$client4_port" # Delete the listener from the client ns, if one was created mptcp_lib_kill_wait $listener_pid =20 --=20 2.40.1 From nobody Tue May 14 15:20:17 2024 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 659DA2AD17 for ; Thu, 7 Mar 2024 12:49:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709815743; cv=none; b=YuW50P43eOIdH5mBiBlRHXJL7A/2eNgRBcwEWgqjPm/OP1YXA7mIIEP1tljZfRel8EjoeT6vHX2yW5zO/plfD11aDr1Y4K/NMny4cqgxM2GxPsZ9g48jrGNanNJrYVMOPj8pJhOLFl8MfnjPpBCwQhltmfgyv3NYCF93BSaodyA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709815743; c=relaxed/simple; bh=J4dFZTAG8Idj+xHHj8IstkFvAxCrO4s+QuHq8BoIKv8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=nYNEAYK4+iC9kOAcecnT45KGDYPagqLbKh15sf0Ha0s3xozZkEGzhlxbEZqNzPI1eo2yVshIKS1DV9mveaT8rRHgP7Gp7PgKn8N6Wm7exMPUajWKZoLI7aJDr3f7mRqiZp94QUYTBj3k9mzJYMK010DWKV8BhpkkgB4/E5TwPms= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=AQqIGY/r; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="AQqIGY/r" Received: by smtp.kernel.org (Postfix) with ESMTPSA id AEC6DC43394; Thu, 7 Mar 2024 12:49:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1709815743; bh=J4dFZTAG8Idj+xHHj8IstkFvAxCrO4s+QuHq8BoIKv8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AQqIGY/rojnnQ7C4i5bQQ8x30oL4Pea2l+Y6TWuur7dm9tuhPKnJ1euk+bfGhKbvi fQx0j95cP/rJZPfhvNtqwFyWswKagyd//dXRZByVLfmq+6m6lhTChhvqd4xXO6zlMK p48Gdwq14SUUbrMN2nGggDcl/XOimntWoHp9HvDQ3WL/N/MLp+2HzX6RUrV4TJwzQf WtcTADhhDRVJV/bHThbwNhvKhEQe1rMZeMHDwSw9ZqvVoxqBnfqwnuFALl+A3XOXr0 S/Hxzy/Ni8JINV2l0qPUj8+q+lAHNauSxb59OB5H3DsA9diD68NMPL6FrO/F4oM8sa s5rCp3qVluWog== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next 3/5] selftests: mptcp: export event macros in mptcp_lib Date: Thu, 7 Mar 2024 20:48:42 +0800 Message-Id: <36afeadc75e82e20c3033628682159c1a4bc38d0.1709815545.git.tanggeliang@kylinos.cn> X-Mailer: git-send-email 2.40.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Geliang Tang SUB_ESTABLISHED, LISTENER_CREATED, LISTENER_CLOSED, AF_INET and AF_INET6 are defined in both mptcp_join.sh and userspace_pm.sh, export all event macros into mptcp_lib.sh. Add MPTCP_LIB_ prefix for the first three and add readonly for the last two. Signed-off-by: Geliang Tang --- .../testing/selftests/net/mptcp/mptcp_join.sh | 23 ++++++++----------- .../testing/selftests/net/mptcp/mptcp_lib.sh | 18 +++++++++++++++ .../selftests/net/mptcp/userspace_pm.sh | 18 +++++++-------- 3 files changed, 36 insertions(+), 23 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index f28b10a61268..5f5be437b9c8 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -2783,13 +2783,6 @@ backup_tests() fi } =20 -SUB_ESTABLISHED=3D10 # MPTCP_EVENT_SUB_ESTABLISHED -LISTENER_CREATED=3D15 #MPTCP_EVENT_LISTENER_CREATED -LISTENER_CLOSED=3D16 #MPTCP_EVENT_LISTENER_CLOSED - -AF_INET=3D2 -AF_INET6=3D10 - verify_listener_events() { local e_type=3D$2 @@ -2799,9 +2792,9 @@ verify_listener_events() local name local rc=3D0 =20 - if [ $e_type =3D $LISTENER_CREATED ]; then + if [ $e_type =3D $MPTCP_LIB_EVENT_LISTENER_CREATED ]; then name=3D"LISTENER_CREATED" - elif [ $e_type =3D $LISTENER_CLOSED ]; then + elif [ $e_type =3D $MPTCP_LIB_EVENT_LISTENER_CLOSED ]; then name=3D"LISTENER_CLOSED " else name=3D"$e_type" @@ -2857,8 +2850,10 @@ add_addr_ports_tests() chk_add_nr 1 1 1 chk_rm_nr 1 1 invert =20 - verify_listener_events $evts_ns1 $LISTENER_CREATED $AF_INET 10.0.2.1 101= 00 - verify_listener_events $evts_ns1 $LISTENER_CLOSED $AF_INET 10.0.2.1 10100 + verify_listener_events $evts_ns1 $MPTCP_LIB_EVENT_LISTENER_CREATED \ + $MPTCP_LIB_AF_INET 10.0.2.1 10100 + verify_listener_events $evts_ns1 $MPTCP_LIB_EVENT_LISTENER_CLOSED \ + $MPTCP_LIB_AF_INET 10.0.2.1 10100 kill_events_pids fi =20 @@ -3464,11 +3459,11 @@ userspace_tests() userspace_pm_chk_get_addr "${ns1}" "10" "id 10 flags signal 10.0.2.1" userspace_pm_chk_get_addr "${ns1}" "20" "id 20 flags signal 10.0.3.1" userspace_pm_rm_addr $ns1 10 - userspace_pm_rm_sf $ns1 "::ffff:10.0.2.1" $SUB_ESTABLISHED + userspace_pm_rm_sf $ns1 "::ffff:10.0.2.1" $MPTCP_LIB_EVENT_SUB_ESTABLISH= ED userspace_pm_chk_dump_addr "${ns1}" \ "id 20 flags signal 10.0.3.1" "after rm_addr 10" userspace_pm_rm_addr $ns1 20 - userspace_pm_rm_sf $ns1 10.0.3.1 $SUB_ESTABLISHED + userspace_pm_rm_sf $ns1 10.0.3.1 $MPTCP_LIB_EVENT_SUB_ESTABLISHED userspace_pm_chk_dump_addr "${ns1}" "" "after rm_addr 20" chk_rm_nr 2 2 invert chk_mptcp_info subflows 0 subflows 0 @@ -3495,7 +3490,7 @@ userspace_tests() "subflow" userspace_pm_chk_get_addr "${ns2}" "20" "id 20 flags subflow 10.0.3.2" userspace_pm_rm_addr $ns2 20 - userspace_pm_rm_sf $ns2 10.0.3.2 $SUB_ESTABLISHED + userspace_pm_rm_sf $ns2 10.0.3.2 $MPTCP_LIB_EVENT_SUB_ESTABLISHED userspace_pm_chk_dump_addr "${ns2}" \ "" \ "after rm_addr 20" diff --git a/tools/testing/selftests/net/mptcp/mptcp_lib.sh b/tools/testing= /selftests/net/mptcp/mptcp_lib.sh index aefe4db47656..5a765af98b71 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_lib.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_lib.sh @@ -8,6 +8,24 @@ readonly KSFT_SKIP=3D4 # shellcheck disable=3DSC2155 # declare and assign separately readonly KSFT_TEST=3D"${MPTCP_LIB_KSFT_TEST:-$(basename "${0}" .sh)}" =20 +# shellcheck disable=3DSC2034 +readonly MPTCP_LIB_EVENT_ANNOUNCED=3D6 # MPTCP_EVENT_ANNOUNCED +# shellcheck disable=3DSC2034 +readonly MPTCP_LIB_EVENT_REMOVED=3D7 # MPTCP_EVENT_REMOVED +# shellcheck disable=3DSC2034 +readonly MPTCP_LIB_EVENT_SUB_ESTABLISHED=3D10 # MPTCP_EVENT_SUB_ESTABLISH= ED +# shellcheck disable=3DSC2034 +readonly MPTCP_LIB_EVENT_SUB_CLOSED=3D11 # MPTCP_EVENT_SUB_CLOSED +# shellcheck disable=3DSC2034 +readonly MPTCP_LIB_EVENT_LISTENER_CREATED=3D15 # MPTCP_EVENT_LISTENER_CREA= TED +# shellcheck disable=3DSC2034 +readonly MPTCP_LIB_EVENT_LISTENER_CLOSED=3D16 # MPTCP_EVENT_LISTENER_CLOS= ED + +# shellcheck disable=3DSC2034 +readonly MPTCP_LIB_AF_INET=3D2 +# shellcheck disable=3DSC2034 +readonly MPTCP_LIB_AF_INET6=3D10 + MPTCP_LIB_SUBTESTS=3D() MPTCP_LIB_SUBTESTS_DUPLICATED=3D0 MPTCP_LIB_TEST_COUNTER=3D0 diff --git a/tools/testing/selftests/net/mptcp/userspace_pm.sh b/tools/test= ing/selftests/net/mptcp/userspace_pm.sh index 28669e49de80..3ae215a46c86 100755 --- a/tools/testing/selftests/net/mptcp/userspace_pm.sh +++ b/tools/testing/selftests/net/mptcp/userspace_pm.sh @@ -19,15 +19,15 @@ if ! mptcp_lib_has_file '/proc/sys/net/mptcp/pm_type'; = then fi mptcp_lib_check_tools ip =20 -ANNOUNCED=3D6 # MPTCP_EVENT_ANNOUNCED -REMOVED=3D7 # MPTCP_EVENT_REMOVED -SUB_ESTABLISHED=3D10 # MPTCP_EVENT_SUB_ESTABLISHED -SUB_CLOSED=3D11 # MPTCP_EVENT_SUB_CLOSED -LISTENER_CREATED=3D15 #MPTCP_EVENT_LISTENER_CREATED -LISTENER_CLOSED=3D16 #MPTCP_EVENT_LISTENER_CLOSED - -AF_INET=3D2 -AF_INET6=3D10 +ANNOUNCED=3D${MPTCP_LIB_EVENT_ANNOUNCED} +REMOVED=3D${MPTCP_LIB_EVENT_REMOVED} +SUB_ESTABLISHED=3D${MPTCP_LIB_EVENT_SUB_ESTABLISHED} +SUB_CLOSED=3D${MPTCP_LIB_EVENT_SUB_CLOSED} +LISTENER_CREATED=3D${MPTCP_LIB_EVENT_LISTENER_CREATED} +LISTENER_CLOSED=3D${MPTCP_LIB_EVENT_LISTENER_CLOSED} + +AF_INET=3D${MPTCP_LIB_AF_INET} +AF_INET6=3D${MPTCP_LIB_AF_INET6} =20 file=3D"" server_evts=3D"" --=20 2.40.1 From nobody Tue May 14 15:20:17 2024 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EEBE912B148 for ; Thu, 7 Mar 2024 12:49:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709815745; cv=none; b=i7SeNIO07S40rQ7wfSZm80txuqSUfx6datZ+7T11f3+wfsiSDz8tpv1F6WuxdzIMBBF0DXk2DXV7G9BXMr7H5TlSH3Tt+3zoPEh1Vq+yeqafFlze/U+LeIm3BayCNKTW/wSTuYqPFnhYDaTbucrKa+hcAJhm6IODTSXAzS6iSLw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709815745; c=relaxed/simple; bh=rfBIY68F5T9/qnXPCXpsp5n6EsXadDbXJU8QcyqCjrc=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=CHm71gg1L2QeIQFo8eDF8Rmpkoz7VFfUKtjjdeetxjhlXKtmL/BCnFhb3hyE81lJYZugXSWlRQDEPFWsNoRMZ3u7A1Eb515Cef3SVejhKbJ3UNsBwx4yNFdjQFu9UCcPlUkXAYbfvN1aZrU+HXPM7Zqu9HfldMSyy3BcPRT8pfA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=cgSSR3kV; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="cgSSR3kV" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 89062C433F1; Thu, 7 Mar 2024 12:49:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1709815744; bh=rfBIY68F5T9/qnXPCXpsp5n6EsXadDbXJU8QcyqCjrc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cgSSR3kVK3IPeQ17/LPvNFXaB2ttnSc0FyuJtc8u7lGLEeIulub1IhUaer9YTyUDA TWlrIaco3bT8jFYD0M9WBixLmMg17cuUf5QAgpglFTgm1bBw/kMt/lF2/JTYbTKyo3 QI+oa/HqTj0V0rfQletMyewvjwokz4SF1zWjdp+p4SPf31jXwsI8An2P9ijGA2W8/R ZJx7HnX6jT5Hibkc/Iej6SRsjVat3IuBLOTMiSXsgZXL6WT+SjHAzD1W+mU/nXvsJw dektF0t0bm72tJBhyXmxnrMHXvoBALmVN8AffASGgs5VkOK3NrK45ma4peF8DER5mQ 076ErA+i2fXCw== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next 4/5] selftests: mptcp: use KSFT_SKIP/KSFT_PASS/KSFT_FAIL Date: Thu, 7 Mar 2024 20:48:43 +0800 Message-Id: <6f60ec8167e1ab3c5e542430871da60e7a6110ab.1709815545.git.tanggeliang@kylinos.cn> X-Mailer: git-send-email 2.40.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Geliang Tang This patch uses the public var KSFT_SKIP in mptcp_lib.sh instead of ksft_skip, and drop 'ksft_skip=3D4' in mptcp_join.sh. Use KSFT_PASS and KSFT_FAIL macros instead of 0 and 1 after 'exit ' and 'ret=3D' in all scripts: exit 0 -> exit ${KSFT_PASS} exit 1 -> exit ${KSFT_FAIL} ret=3D0 -> ret=3D${KSFT_PASS} ret=3D1 -> ret=3D${KSFT_FAIL} Signed-off-by: Geliang Tang --- .../selftests/net/mptcp/mptcp_connect.sh | 18 +++++++++--------- .../testing/selftests/net/mptcp/mptcp_join.sh | 13 ++++++------- .../selftests/net/mptcp/mptcp_sockopt.sh | 4 ++-- .../testing/selftests/net/mptcp/pm_netlink.sh | 8 ++++---- .../selftests/net/mptcp/simult_flows.sh | 4 ++-- .../selftests/net/mptcp/userspace_pm.sh | 8 ++++---- 6 files changed, 27 insertions(+), 28 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_connect.sh b/tools/tes= ting/selftests/net/mptcp/mptcp_connect.sh index cb1837f2761a..4c4248554826 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_connect.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_connect.sh @@ -65,14 +65,14 @@ while getopts "$optstring" option;do case "$option" in "h") usage $0 - exit 0 + exit ${KSFT_PASS} ;; "d") if [ $OPTARG -ge 0 ];then tc_delay=3D"$OPTARG" else echo "-d requires numeric argument, got \"$OPTARG\"" 1>&2 - exit 1 + exit ${KSFT_FAIL} fi ;; "e") @@ -96,7 +96,7 @@ while getopts "$optstring" option;do sndbuf=3D"$OPTARG" else echo "-S requires numeric argument, got \"$OPTARG\"" 1>&2 - exit 1 + exit ${KSFT_FAIL} fi ;; "R") @@ -104,7 +104,7 @@ while getopts "$optstring" option;do rcvbuf=3D"$OPTARG" else echo "-R requires numeric argument, got \"$OPTARG\"" 1>&2 - exit 1 + exit ${KSFT_FAIL} fi ;; "m") @@ -121,7 +121,7 @@ while getopts "$optstring" option;do ;; "?") usage $0 - exit 1 + exit ${KSFT_FAIL} ;; esac done @@ -263,7 +263,7 @@ check_mptcp_disabled() if [ "$(ip netns exec ${disabled_ns} sysctl net.mptcp.enabled | awk '{ pr= int $3 }')" -ne 1 ]; then mptcp_lib_pr_fail "net.mptcp.enabled sysctl is not 1 by default" mptcp_lib_result_fail "net.mptcp.enabled sysctl is not 1 by default" - ret=3D1 + ret=3D${KSFT_FAIL} return 1 fi ip netns exec ${disabled_ns} sysctl -q net.mptcp.enabled=3D0 @@ -276,7 +276,7 @@ check_mptcp_disabled() if [ ${err} -eq 0 ]; then mptcp_lib_pr_fail "New MPTCP socket cannot be blocked via sysctl" mptcp_lib_result_fail "New MPTCP socket cannot be blocked via sysctl" - ret=3D1 + ret=3D${KSFT_FAIL} return 1 fi =20 @@ -302,7 +302,7 @@ do_ping() =20 if [ $rc -ne 0 ] ; then mptcp_lib_pr_fail "$listener_ns -> $connect_addr connectivity" - ret=3D1 + ret=3D${KSFT_FAIL} =20 return 1 fi @@ -821,7 +821,7 @@ log_if_error() mptcp_lib_pr_fail "${msg}" =20 final_ret=3D${ret} - ret=3D0 + ret=3D${KSFT_PASS} =20 return ${final_ret} fi diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index 5f5be437b9c8..6d725419b7d4 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -25,7 +25,6 @@ err=3D"" capout=3D"" ns1=3D"" ns2=3D"" -ksft_skip=3D4 iptables=3D"iptables" ip6tables=3D"ip6tables" timeout_poll=3D30 @@ -392,15 +391,15 @@ setup_fail_rules() -p tcp \ -m length --length 150:9999 \ -m statistic --mode nth --packet 1 --every 99999 \ - -j MARK --set-mark 42 || return ${ksft_skip} + -j MARK --set-mark 42 || return ${KSFT_SKIP} =20 - tc -n $ns2 qdisc add dev ns2eth$i clsact || return ${ksft_skip} + tc -n $ns2 qdisc add dev ns2eth$i clsact || return ${KSFT_SKIP} tc -n $ns2 filter add dev ns2eth$i egress \ protocol ip prio 1000 \ handle 42 fw \ action pedit munge offset 148 u8 invert \ pipe csum tcp \ - index 100 || return ${ksft_skip} + index 100 || return ${KSFT_SKIP} } =20 reset_with_fail() @@ -414,7 +413,7 @@ reset_with_fail() local rc=3D0 setup_fail_rules "${@}" || rc=3D$? =20 - if [ ${rc} -eq ${ksft_skip} ]; then + if [ ${rc} -eq ${KSFT_SKIP} ]; then mark_as_skipped "unable to set the 'fail' rules" return 1 fi @@ -450,7 +449,7 @@ reset_with_tcp_filter() # $1: err msg fail_test() { - ret=3D1 + ret=3D${KSFT_FAIL} =20 print_fail "${@}" =20 @@ -3633,7 +3632,7 @@ usage() { if [ -n "${1}" ]; then echo "${1}" - ret=3D1 + ret=3D${KSFT_FAIL} fi =20 echo "mptcp_join usage:" diff --git a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh b/tools/tes= ting/selftests/net/mptcp/mptcp_sockopt.sh index 96aa8f71bbb0..e2d70c18786e 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh @@ -105,7 +105,7 @@ check_mark() if [ $v -ne 0 ]; then mptcp_lib_pr_fail "got $tables $values in ns $ns," \ "not 0 - not all expected packets marked" - ret=3D1 + ret=3D${KSFT_FAIL} return 1 fi done @@ -178,7 +178,7 @@ do_transfer() =20 mptcp_lib_result_fail "transfer ${ip}" =20 - ret=3D1 + ret=3D${KSFT_FAIL} return 1 fi if ! mptcp_lib_check_transfer $cin $sout "file received by server"; then diff --git a/tools/testing/selftests/net/mptcp/pm_netlink.sh b/tools/testin= g/selftests/net/mptcp/pm_netlink.sh index 69ffff8b076b..6ab8c5d36340 100755 --- a/tools/testing/selftests/net/mptcp/pm_netlink.sh +++ b/tools/testing/selftests/net/mptcp/pm_netlink.sh @@ -19,11 +19,11 @@ while getopts "$optstring" option;do case "$option" in "h") usage $0 - exit 0 + exit ${KSFT_PASS} ;; "?") usage $0 - exit 1 + exit ${KSFT_FAIL} ;; esac done @@ -57,13 +57,13 @@ check() mptcp_lib_check_output "${err}" "${cmd}" "${expected}" || rc=3D${?} if [ ${rc} -eq 2 ]; then mptcp_lib_result_fail "${msg} # error ${rc}" - ret=3D1 + ret=3D${KSFT_FAIL} elif [ ${rc} -eq 0 ]; then mptcp_lib_print_ok "[ OK ]" mptcp_lib_result_pass "${msg}" elif [ ${rc} -eq 1 ]; then mptcp_lib_result_fail "${msg} # different output" - ret=3D1 + ret=3D${KSFT_FAIL} fi } =20 diff --git a/tools/testing/selftests/net/mptcp/simult_flows.sh b/tools/test= ing/selftests/net/mptcp/simult_flows.sh index 4ee18406ee50..68ee92eccccb 100755 --- a/tools/testing/selftests/net/mptcp/simult_flows.sh +++ b/tools/testing/selftests/net/mptcp/simult_flows.sh @@ -263,7 +263,7 @@ while getopts "bcdh" option;do case "$option" in "h") usage $0 - exit 0 + exit ${KSFT_PASS} ;; "b") bail=3D1 @@ -276,7 +276,7 @@ while getopts "bcdh" option;do ;; "?") usage $0 - exit 1 + exit ${KSFT_FAIL} ;; esac done diff --git a/tools/testing/selftests/net/mptcp/userspace_pm.sh b/tools/test= ing/selftests/net/mptcp/userspace_pm.sh index 3ae215a46c86..9c017082f603 100755 --- a/tools/testing/selftests/net/mptcp/userspace_pm.sh +++ b/tools/testing/selftests/net/mptcp/userspace_pm.sh @@ -86,7 +86,7 @@ test_skip() test_fail() { mptcp_lib_pr_fail "${@}" - ret=3D1 + ret=3D${KSFT_FAIL} mptcp_lib_result_fail "${test_name}" } =20 @@ -206,7 +206,7 @@ make_connection() else test_fail "Expected tokens (c:${client_token} - s:${server_token}) and s= erver (c:${client_serverside} - s:${server_serverside})" mptcp_lib_result_print_all_tap - exit 1 + exit ${KSFT_FAIL} fi =20 if [ "$is_v6" =3D "v6" ] @@ -237,7 +237,7 @@ check_expected() return 0 fi =20 - ret=3D1 + ret=3D${KSFT_FAIL} mptcp_lib_result_fail "${test_name}" return 1 } @@ -842,7 +842,7 @@ verify_listener_events() if [ "${rc}" -eq 0 ]; then test_pass else - ret=3D1 + ret=3D${KSFT_FAIL} mptcp_lib_result_fail "${test_name}" fi } --=20 2.40.1 From nobody Tue May 14 15:20:17 2024 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CC23F12B148 for ; Thu, 7 Mar 2024 12:49:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709815746; cv=none; b=CKPc/W+ybTEwq5ThWvpRaZXZYGugZZOCF+1e3GtTYPUN7G9YAUgR8VbJ/hMYAVD94JFBQDq6icT60c03ry2Lo5EoqQdNHSjrWqm78rou5nGQxO2FBQMkibMXUC/W9IHudDhnc2sKne9NhDlmlZmJld3X8isqnv2UZpuSxLcUyiw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709815746; c=relaxed/simple; bh=75lZYm5RnBVAJshl4hWLbg/xKVYZyfEzLM43y1KIANQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=UPNNXgbh+TSFZfNUCOGosyQPWGVEce52oFr+38T40Gc5tW12R9vSz8uLKn4aFuvp12MWG4X4f40tVMi+xosKCW9PzsDglph7R8urlLM56WzoNcmugUpNjMlP8S2qe+IVjBXqNZV7DyCTm57SFJ4jVDEbe4yWpQfOLPpqFWH4SeQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=q+8jgNMX; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="q+8jgNMX" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2285BC43390; Thu, 7 Mar 2024 12:49:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1709815746; bh=75lZYm5RnBVAJshl4hWLbg/xKVYZyfEzLM43y1KIANQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=q+8jgNMXVWNz4iyc7zOxlSUVwOJJCjntTNTXE66vwX0mb1BJo+asx0OnovBaP26jO YEQGgjar9zJsK4M8WBjrIGjhY/uUknp9Jx2v9ygnuKOwQqi5rnl3wFPJkbglCtd6js w/aF4RjjEAlNKnkti1r3hDCvpTs/LDFjLUv8qO3xEWdx3sgjmnt9wHUxQz7k7dHjxA 4VBHR9JULkktzNPXF5d0ywH1IqUZDPLWbGEVmNeUrSEZ7VqeH7vEtQ/wh1gsdYnzKd /Gr1WwXJfAk5ZlyGd819OVCKalDofs3k08rnWQh2IfTQNY1bP3SIC6/I6BJXZxtnvO O82eND7d35NIw== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next 5/5] selftests: mptcp: join: use += operator to append strings Date: Thu, 7 Mar 2024 20:48:44 +0800 Message-Id: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Geliang Tang This patch uses addition assignment operator (+=3D) to append strings inste= ad of open-coding in mptcp_join.sh. This can make the statements shorter. Signed-off-by: Geliang Tang --- .../testing/selftests/net/mptcp/mptcp_join.sh | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index 6d725419b7d4..b70bd8e0088a 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -753,18 +753,18 @@ pm_nl_check_endpoint() line=3D"${line% }" # the dump order is: address id flags port dev [ -n "$addr" ] && expected_line=3D"$addr" - expected_line=3D"$expected_line $id" - [ -n "$_flags" ] && expected_line=3D"$expected_line ${_flags//","/" "}" - [ -n "$dev" ] && expected_line=3D"$expected_line $dev" - [ -n "$port" ] && expected_line=3D"$expected_line $port" + expected_line+=3D" $id" + [ -n "$_flags" ] && expected_line+=3D" ${_flags//","/" "}" + [ -n "$dev" ] && expected_line+=3D" $dev" + [ -n "$port" ] && expected_line+=3D" $port" else line=3D$(ip netns exec $ns ./pm_nl_ctl get $_id) # the dump order is: id flags dev address port expected_line=3D"$id" - [ -n "$flags" ] && expected_line=3D"$expected_line $flags" - [ -n "$dev" ] && expected_line=3D"$expected_line $dev" - [ -n "$addr" ] && expected_line=3D"$expected_line $addr" - [ -n "$_port" ] && expected_line=3D"$expected_line $_port" + [ -n "$flags" ] && expected_line+=3D" $flags" + [ -n "$dev" ] && expected_line+=3D" $dev" + [ -n "$addr" ] && expected_line+=3D" $addr" + [ -n "$_port" ] && expected_line+=3D" $_port" fi if [ "$line" =3D "$expected_line" ]; then print_ok @@ -1032,7 +1032,7 @@ do_transfer() fi fi =20 - extra_srv_args=3D"$extra_args $extra_srv_args" + extra_srv_args+=3D" $extra_args" if [ "$test_linkfail" -gt 1 ];then timeout ${timeout_test} \ ip netns exec ${listener_ns} \ @@ -1048,7 +1048,7 @@ do_transfer() =20 mptcp_lib_wait_local_port_listen "${listener_ns}" "${port}" =20 - extra_cl_args=3D"$extra_args $extra_cl_args" + extra_cl_args+=3D" $extra_args" if [ "$test_linkfail" -eq 0 ];then timeout ${timeout_test} \ ip netns exec ${connector_ns} \ @@ -1215,7 +1215,7 @@ chk_csum_nr() print_check "sum" count=3D$(mptcp_lib_get_counter ${ns1} "MPTcpExtDataCsumErr") if [ "$count" !=3D "$csum_ns1" ]; then - extra_msg=3D"$extra_msg ns1=3D$count" + extra_msg+=3D" ns1=3D$count" fi if [ -z "$count" ]; then print_skip @@ -1228,7 +1228,7 @@ chk_csum_nr() print_check "csum" count=3D$(mptcp_lib_get_counter ${ns2} "MPTcpExtDataCsumErr") if [ "$count" !=3D "$csum_ns2" ]; then - extra_msg=3D"$extra_msg ns2=3D$count" + extra_msg+=3D" ns2=3D$count" fi if [ -z "$count" ]; then print_skip @@ -1272,7 +1272,7 @@ chk_fail_nr() print_check "ftx" count=3D$(mptcp_lib_get_counter ${ns_tx} "MPTcpExtMPFailTx") if [ "$count" !=3D "$fail_tx" ]; then - extra_msg=3D"$extra_msg,tx=3D$count" + extra_msg+=3D",tx=3D$count" fi if [ -z "$count" ]; then print_skip @@ -1286,7 +1286,7 @@ chk_fail_nr() print_check "failrx" count=3D$(mptcp_lib_get_counter ${ns_rx} "MPTcpExtMPFailRx") if [ "$count" !=3D "$fail_rx" ]; then - extra_msg=3D"$extra_msg,rx=3D$count" + extra_msg+=3D",rx=3D$count" fi if [ -z "$count" ]; then print_skip @@ -1321,7 +1321,7 @@ chk_fclose_nr() if [ -z "$count" ]; then print_skip elif [ "$count" !=3D "$fclose_tx" ]; then - extra_msg=3D"$extra_msg,tx=3D$count" + extra_msg+=3D",tx=3D$count" fail_test "got $count MP_FASTCLOSE[s] TX expected $fclose_tx" else print_ok @@ -1332,7 +1332,7 @@ chk_fclose_nr() if [ -z "$count" ]; then print_skip elif [ "$count" !=3D "$fclose_rx" ]; then - extra_msg=3D"$extra_msg,rx=3D$count" + extra_msg+=3D",rx=3D$count" fail_test "got $count MP_FASTCLOSE[s] RX expected $fclose_rx" else print_ok @@ -1701,7 +1701,7 @@ chk_rm_nr() count=3D$((count + cnt)) if [ "$count" !=3D "$rm_subflow_nr" ]; then suffix=3D"$count in [$rm_subflow_nr:$((rm_subflow_nr*2))]" - extra_msg=3D"$extra_msg simult" + extra_msg+=3D" simult" fi if [ $count -ge "$rm_subflow_nr" ] && \ [ "$count" -le "$((rm_subflow_nr *2 ))" ]; then --=20 2.40.1