From patchwork Sun May 28 17:35:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthieu Baerts X-Patchwork-Id: 13257907 X-Patchwork-Delegate: kuba@kernel.org Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net [23.128.96.19]) (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 E17766FD9 for ; Sun, 28 May 2023 17:36:18 +0000 (UTC) Received: from mail-wm1-x32e.google.com (mail-wm1-x32e.google.com [IPv6:2a00:1450:4864:20::32e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 02CF8102 for ; Sun, 28 May 2023 10:36:11 -0700 (PDT) Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-3f6a6b9c079so16629305e9.1 for ; Sun, 28 May 2023 10:36:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tessares.net; s=google; t=1685295370; x=1687887370; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=XVE6CUkf5Xm7j0hYIyU7Kgv2NM/UdT9FCbmvgEasBPI=; b=sOOtbh6QGU3DQCiv9d4ZMoWHoWFR3uzyNpT20ytEIvDUyU7IoNvnpydAyXUas08CKz wxsfgex3RPYnXg3k/pNhwTkfhP+PH+wNA5kexFQNwjwxx8s4DH96CFjblCAcqrY/p7+X FGR4E3sLUku8nfsqo8Rc1GH1FexmX6o7yj/DtO51suggyy7LBUkqXxfyEgrPuN9sUQV8 3Uc+S0hih4LfPo/SLQO4mKMZu1cXIt37yN8LJEQ0XxLWP9QRH5OEYGtg+o/UQj3V8gFN GP3MKE2n46ffENt2yrP8ql1GeVcT887QagZPwmGmtBEqvMviEpB/a+bpd4WA0uLFwajM mXUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685295370; x=1687887370; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=XVE6CUkf5Xm7j0hYIyU7Kgv2NM/UdT9FCbmvgEasBPI=; b=fQwX3rgrS7sW8a6Zv7BOe7oqH7opKn7Z82L2G7GMDTn7U99imOU+qB0xG1HGRRgKGI x6ve2c3AXd2DgKErxJEfecb/DreXCX2cBPuHlRbcwZKpCzygZn+KZtIK48kXeOYwt9kF MZOagq0rZ4F5p7TNSzH4GiSjdrxvNT67T79A7Ja0a+F9THiGP3MoYu1x3B9cdFYSDC3H T/jegl9cgJ7DygPq+OJ2D9lXWfkOfAQ0+/MIvsjz0054ND56l801S98eBKZotgsDo1I5 lnC22tTcDe3t8EodSNpr0vQWB7Bs3RCUmB0r16YExpkcPmmx7uYxLeKKHjgkZqFEk7W0 mXsg== X-Gm-Message-State: AC+VfDzfX20muwRBELPKnWeBLIHoJElSJo7MlvA4WVQfBy9dbE7Plon9 V/naeR6Nm2djH118VGFEXj62eujlketP4wyVBX8QTg== X-Google-Smtp-Source: ACHHUZ62py82yK1xV2gsxWuBbNgdsO5kSxLZabr+1/z8IIKmStOiYcvStDOy+JwFmGYQIx7TAdCL1A== X-Received: by 2002:a1c:7918:0:b0:3f6:50e:315f with SMTP id l24-20020a1c7918000000b003f6050e315fmr6423871wme.41.1685295370010; Sun, 28 May 2023 10:36:10 -0700 (PDT) Received: from vdi08.nix.tessares.net (static.219.156.76.144.clients.your-server.de. [144.76.156.219]) by smtp.gmail.com with ESMTPSA id z10-20020a7bc7ca000000b003f602e2b653sm15334523wmk.28.2023.05.28.10.36.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 28 May 2023 10:36:09 -0700 (PDT) From: Matthieu Baerts Date: Sun, 28 May 2023 19:35:32 +0200 Subject: [PATCH net 7/8] selftests: mptcp: sockopt: skip if MPTCP is not supported Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20230528-upstream-net-20230528-mptcp-selftests-support-old-kernels-part-1-v1-7-a32d85577fc6@tessares.net> References: <20230528-upstream-net-20230528-mptcp-selftests-support-old-kernels-part-1-v1-0-a32d85577fc6@tessares.net> In-Reply-To: <20230528-upstream-net-20230528-mptcp-selftests-support-old-kernels-part-1-v1-0-a32d85577fc6@tessares.net> To: mptcp@lists.linux.dev, Mat Martineau , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Shuah Khan , Christoph Paasch , Florian Westphal , Davide Caratti , Kishen Maloor Cc: netdev@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, Matthieu Baerts , stable@vger.kernel.org X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1201; i=matthieu.baerts@tessares.net; h=from:subject:message-id; bh=kQKfxu33/TKdTEp2HTz906dbSPVxanbcCaiMbKwHsos=; b=owEBbQKS/ZANAwAIAfa3gk9CaaBzAcsmYgBkc5EBYuuTgrHoIKtcSjWHisgGd2VcKMhrcPB/r J/SupQ1t2yJAjMEAAEIAB0WIQToy4X3aHcFem4n93r2t4JPQmmgcwUCZHORAQAKCRD2t4JPQmmg c9oxEACk8oAjyDKsO7XkrztBSp9DjP71JXrYQMhuHsaRWRfCUnlJf1XvAxwksDYdf+AwwLNVoNB Zk6yMPVrszOYV03Rp/aPxCevecbjJXhCnzd+hbeiHzLz/D+U6gMgLKRNwFLq6suWTKgksWEHOfY h9386U3a5bnxL3it7jE7NXvekXx8PZ3m/wCrdGytfvysLIjJb63V9nxSshqJKIipA4Q3IASsiJ7 vZDhGDyIsCp452zgkrH8bakL4zN/DtcoyQHVUQEZelaZbCLPxAvGYSbRhgNacDTEQrHYY4x5CT+ vfEk9j9WSqRTnotl+soNfihWaqGQEPpvNo4mo1Akv2JRZZ7ePxRB90726pYMHWODSCzcw1GEuU5 peXNW2tx+J2tNXeDjWn/Ru8T2cRHL4FJ6+WeYclKCMqJ8YDW0ulrndN1nspDyogGNapP5w4Viyj iqknPH5QeqKaopFjseboxZJf3rmCrm/KjvktZFdbvVmKHFq/1psM0wIAOGCzABovl190qk2pxSL GWsEkRo7hfOQReuuTN+CbWVBvpK9LXAuOdHAw1F8IjkdQ68t1IVs82gSDgGVOcbAOW7elWi8FwJ ta+cxiig6K8yGmpWQCqTNF0PnX/uQhWB4pYBH71HpOI6+wUFPx67avvioOH+xUybWhxuqgUykOl HrKhZvkKQuoLEcg== X-Developer-Key: i=matthieu.baerts@tessares.net; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net X-Patchwork-Delegate: kuba@kernel.org Selftests are supposed to run on any kernels, including the old ones not supporting MPTCP. A new check is then added to make sure MPTCP is supported. If not, the test stops and is marked as "skipped". Link: https://github.com/multipath-tcp/mptcp_net-next/issues/368 Fixes: dc65fe82fb07 ("selftests: mptcp: add packet mark test case") Cc: stable@vger.kernel.org Acked-by: Paolo Abeni Signed-off-by: Matthieu Baerts --- tools/testing/selftests/net/mptcp/mptcp_sockopt.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh b/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh index 1b70c0a304ce..ff5adbb9c7f2 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh @@ -1,6 +1,8 @@ #!/bin/bash # SPDX-License-Identifier: GPL-2.0 +. "$(dirname "${0}")/mptcp_lib.sh" + ret=0 sin="" sout="" @@ -84,6 +86,8 @@ cleanup() rm -f "$sin" "$sout" } +mptcp_lib_check_mptcp + ip -Version > /dev/null 2>&1 if [ $? -ne 0 ];then echo "SKIP: Could not run test without ip tool"