Message ID | 20230528-upstream-net-20230528-mptcp-selftests-support-old-kernels-part-1-v1-4-a32d85577fc6@tessares.net |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp1071024vqr; Sun, 28 May 2023 10:44:36 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ686a5yED6GVKSaz+YIoCHVDoH2RZbHtF5Usz/ztWVY2lR9Sd00FBkCAO6Gy8t0euyW9TK7 X-Received: by 2002:a17:90a:9c0e:b0:256:6167:c725 with SMTP id h14-20020a17090a9c0e00b002566167c725mr2631149pjp.6.1685295876256; Sun, 28 May 2023 10:44:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685295876; cv=none; d=google.com; s=arc-20160816; b=c5zO613fRIlVOweaLQBnT6p9AWTo+KOPjr0uqj756xnaNQGUbqrZe7PRjn6ytudF5H aa+7DIw4cyekzEZtht1s3xUqXJctPf1vNfDGm2YNBoiW35fcZUpXxDBdK7MEZQG8wVPU LiBKXb44Jnab0AeRI/A7UZVGVnRiSlW3B+7NJcUBI7x2/gE2GhqcvJMk5xc56jqzITLR 8CWWqOmAcRPlsn457UaatWCRgfCI3xyl9YipzRQwGwB7OzJEr376NJwvaiblBK6gWgCt j+vksOQ71QYgnSigYayJQV4H7ZwzAgu6jDhz4hCLGTy1HIR3E9OnjMjxh+EKdSQ7pU4e zqxA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=q6K6x3Lobx0QTfuXnuqsexfdlQfCdQatiGE2P4TfjVI=; b=KhI1K571n2Jt5s0nGH/07OUJckPPdiq+pAPl9QDrijUUB+m/F0XbLi+PnuLjguMKpQ coYSrAO7m3PgbpsscnDnPul8G4OV2tgAVtKFu9/1htUaDzJdBGRuVvxJRLUXeGo2ConZ wC08h/Q6LU0Rjwqhc8Li0sJ+fnf8lLBselHHLXtPqFXyDdQMw6Kryu1w9bkt9xcsQuz9 lP1cSqmx+UJeB5kKClP68WzZ+sOZFZL8mccBWZ4+TrWTdwM+mgPea6no5LvufSo5iQqJ 4H3TiuQO8RkPL13Cq49hgnA4ym/xHQGE9CmrT9ub9x80qW1cihYp1KGLkr+bEVM7+/BQ T8BA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@tessares.net header.s=google header.b=1QNqfwAj; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=tessares.net Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id hg14-20020a17090b300e00b0024e4df1b2e3si3889188pjb.123.2023.05.28.10.44.22; Sun, 28 May 2023 10:44:36 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@tessares.net header.s=google header.b=1QNqfwAj; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=tessares.net Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229759AbjE1Rg0 (ORCPT <rfc822;zhuangel570@gmail.com> + 99 others); Sun, 28 May 2023 13:36:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43604 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229660AbjE1RgS (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Sun, 28 May 2023 13:36:18 -0400 Received: from mail-wm1-x32f.google.com (mail-wm1-x32f.google.com [IPv6:2a00:1450:4864:20::32f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3B8C4F4 for <linux-kernel@vger.kernel.org>; Sun, 28 May 2023 10:36:08 -0700 (PDT) Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-3f606a80d34so16940125e9.0 for <linux-kernel@vger.kernel.org>; Sun, 28 May 2023 10:36:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tessares.net; s=google; t=1685295367; x=1687887367; 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=q6K6x3Lobx0QTfuXnuqsexfdlQfCdQatiGE2P4TfjVI=; b=1QNqfwAjXGQ8lj2nB5KIJEJmvxLxHIYpQbxUVsUqP2hXYqLY8YF9bWvlvDvJJvniZw +7IVEf62g1bXPANco6ACu2HGPUdYUwFbmCSbLsIMTOnkIN3ExZi0j/hWxI/pX1Xn/8A3 0PvzI/vfNHo/wqbMyyqoclkFtL1XSiI/+QtjbB2D9LiUQxZaODS+5bHkg2inokEhv0RB SLjA5tdQ7CZ7ZkzC1CB8qQceNwzQKgPRQvkKFczsDal10uZQ4lHZTq3d3lWnKg8UPVZW jhG3WifxxGHGRfKJFbzmAWRNtYTYfRFSRDg7DRrrIE+vil1Kqs5tBx1qPg1n5B3Fjaqa xb5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685295367; x=1687887367; 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=q6K6x3Lobx0QTfuXnuqsexfdlQfCdQatiGE2P4TfjVI=; b=kRmpMJiwDAmASagOFlPq8oRY9z8qRerSKMwvqFE4T+NAd4p6VEsKpYIG6v6mMYnqxV ujdrrm1q86bYYfRnJTDFvnuE75hGytD1r1bHAWmq4jQlMs3QrrraJISDKpzSB8C6LCtp lwQjNZZYigEL/NHKA9cjee7nypRYEgYyFaMV8I5e3bELo1mwfl4Zt6cCsqf8Ij2woFyK dpyhfVJTvNjXixlz7S4wgcMwg+EJEmjN3x1duXHfcxIPCR7qOfSppG5XLgwe5U31Ebdx hds4bpr9ZWDsKH6mYNf5K5Kf5uOrI04Ojxd7molHPK/HbL5hPdJnNimHaqE1zbNVI9Q6 V2wg== X-Gm-Message-State: AC+VfDxObe3gzNb2AKiUq5CamIfLOjrEmDMaci8Uer4TwanpsmiucIXV naO1Nb6uh6HAt/qZvpKXNTg2vQ== X-Received: by 2002:a7b:cd89:0:b0:3f6:4ca:479a with SMTP id y9-20020a7bcd89000000b003f604ca479amr6674402wmj.21.1685295366744; Sun, 28 May 2023 10:36:06 -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.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 28 May 2023 10:36:06 -0700 (PDT) From: Matthieu Baerts <matthieu.baerts@tessares.net> Date: Sun, 28 May 2023 19:35:29 +0200 Subject: [PATCH net 4/8] selftests: mptcp: join: skip if MPTCP is not supported MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20230528-upstream-net-20230528-mptcp-selftests-support-old-kernels-part-1-v1-4-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 <martineau@kernel.org>, "David S. Miller" <davem@davemloft.net>, Eric Dumazet <edumazet@google.com>, Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>, Shuah Khan <shuah@kernel.org>, Christoph Paasch <cpaasch@apple.com>, Florian Westphal <fw@strlen.de>, Davide Caratti <dcaratti@redhat.com>, Kishen Maloor <kishen.maloor@intel.com> Cc: netdev@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, Matthieu Baerts <matthieu.baerts@tessares.net>, stable@vger.kernel.org X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1255; i=matthieu.baerts@tessares.net; h=from:subject:message-id; bh=SsOVrl07HCP7CyVkUoTtr6mVX+4hyXcjlT17Oj+pCOc=; b=owEBbQKS/ZANAwAIAfa3gk9CaaBzAcsmYgBkc5EAs5z14UH5i9SlXEU/9nZD+c+nJpPDVd5gA 5kFmMOf3q6JAjMEAAEIAB0WIQToy4X3aHcFem4n93r2t4JPQmmgcwUCZHORAAAKCRD2t4JPQmmg c0NhD/9X52SIPSCiXlegDZgEHVwg+6nivyNN7FOPblEzYOK7A3anDzDzxWD9MJNysOx+s0BSk3/ gnAaKJC82nShOtmRhwqhCMt1OGTZaDXTPg6fzWWIeX9qaQMwTxRTfXMO46lKJzSByKV+r7Ah8h6 9w871ERRkVAQnSXHj6cPToI64Sxp8Zs3Jxc/A8gqY3vJ1csYojcYHh4QCGvAc88pNLVPbsw45kV 5JbfJlvyv/JQySCQsywmXrfEYmCS0PG2LoQWQgUWRsCY82zeKtxeOldOPcVhvz4o+wQJBS4ttIF F1us8YaJZlUiLt/NWaFBWBoc1QDluWwG4mMqT0c7X0YFmSDutMyMutdEosQr8ff/7M9MJSM+H9A xkceWuQhFp24c7SrCWQ10Dq5NqsdaqRLPJLKaQbNcriVsbRQZvvDCWMMSUsv8MW8HsWZY3grBpn 4w9pbqILgEfrM6gSQppKROp4B/M40zgBvEPuhtg1fb/43+xWBMzL4m39JhaeGpx8DH6UYShSk5w ffsUbi15v1jqDcqnTjUqtVxNKGzjv24Ayk0dlGxPJxMEz5BvpALpvy3H80ElskzrZBVTqIr3/Fq I9k+pqNXmmNTZrOUM2iEKpUM9P91M8+pkfXdrGze+g5bSIjGbTtqIeLTumGGF1upN6+AuzfQxkL wd/fWhaRoN7lzdg== 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=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1767160808774117810?= X-GMAIL-MSGID: =?utf-8?q?1767160808774117810?= |
Series |
selftests: mptcp: skip tests not supported by old kernels (part 1)
|
|
Commit Message
Matthieu Baerts
May 28, 2023, 5:35 p.m. UTC
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: b08fbf241064 ("selftests: add test-cases for MPTCP MP_JOIN") Cc: stable@vger.kernel.org Acked-by: Paolo Abeni <pabeni@redhat.com> Signed-off-by: Matthieu Baerts <matthieu.baerts@tessares.net> --- tools/testing/selftests/net/mptcp/mptcp_join.sh | 4 ++++ 1 file changed, 4 insertions(+)
diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testing/selftests/net/mptcp/mptcp_join.sh index 4f3fe45f8f71..96f63172b8fe 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -10,6 +10,8 @@ # because it's invoked by variable name, see how the "tests" array is used #shellcheck disable=SC2317 +. "$(dirname "${0}")/mptcp_lib.sh" + ret=0 sin="" sinfail="" @@ -137,6 +139,8 @@ cleanup_partial() check_tools() { + mptcp_lib_check_mptcp + if ! ip -Version &> /dev/null; then echo "SKIP: Could not run test without ip tool" exit $ksft_skip