From nobody Tue Feb 10 06:43:03 2026 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6638:bd2:0:0:0:0 with SMTP id g18csp668339jad; Thu, 17 Feb 2022 09:43:54 -0800 (PST) X-Google-Smtp-Source: ABdhPJxN9xFTmZjOxg43/faBFHz8LBc4S6llHSClx5lQeJbrShGklJWJd1IE8xYtL7E1XSU3o/mD X-Received: by 2002:a05:6a00:244f:b0:4cc:a2ba:4cd8 with SMTP id d15-20020a056a00244f00b004cca2ba4cd8mr4201853pfj.74.1645119834071; Thu, 17 Feb 2022 09:43:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645119834; cv=none; d=google.com; s=arc-20160816; b=MsTYQ4cTlG5IBrDbU3z1wJ3u5/ZRV2BqLVb6SYBgxTnno/xKfzuhc5hhO9t86WiMJU dzSEE//0G7thVIYKIFqcMKfYuyJRhjzAZNoK+ki6/yQJTDkHPvALUnBlxpJrEFAmvI9n hCuihgEWP6GyQYIqdkOaEPQUlnZqsJxpATzS1fAQpCcnicMrGeqG0ySGjMiOZRnLbw5K qnm0rPY96BCZ5YDRj2mw6grHo/vKI1XDbzJwN6YHGkxai2LD1Z5eZMO2zFXJO2afviba 6RxoLfISuYrdj8aXfQAZjQ8DiPPH/5D969q0AiAEk0LiHF0XDKj4ZTVzS7ubjNIq1T3l zwqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=Z5mCHXlgCr1Jy2Vc+TRuUoNTiJ7IX+SwmRwresxLMD4=; b=dW04N+6iFbZVXqThhHq9cdHLQHqhLlagcCCFTkACiDcvM7NX/D6oHaotf1mVn7UMqp rPbXSNarwSKpCIOgHKuWJMIvSmyUkAQZh6e7DZjrBC+SCAcgzg/lCXeLw1Ten8/LcFwK HrgOq4jw2QVaOCyornm8K80rtwgFIgH/tKnf+NHNOcJfv4mTAtQRzzKMaqI2J/I96+CS 8iqOoNnZKtRwzwgvDcWVqQsCmZyqrtMwtVhea7Zn/S7H5XV5Dj1AmRAlcaSBwL2tMV1q 9UG+Qojjg0RNXX3DdHAc1x7FOb//4mS5ganjQWD08Ly3OFRgCgiqjF/qpDJP0sEb1gu1 VRlA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@tessares-net.20210112.gappssmtp.com header.s=20210112 header.b=eWT1RfGW; spf=pass (google.com: domain of mptcp+bounces-3808-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3808-wpasupplicant.patchew=gmail.com@lists.linux.dev" Return-Path: Received: from sjc.edge.kernel.org (sjc.edge.kernel.org. [2604:1380:1000:8100::1]) by mx.google.com with ESMTPS id m5si5424657plt.242.2022.02.17.09.43.53 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 17 Feb 2022 09:43:54 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3808-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) client-ip=2604:1380:1000:8100::1; Authentication-Results: mx.google.com; dkim=pass header.i=@tessares-net.20210112.gappssmtp.com header.s=20210112 header.b=eWT1RfGW; spf=pass (google.com: domain of mptcp+bounces-3808-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3808-wpasupplicant.patchew=gmail.com@lists.linux.dev" Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sjc.edge.kernel.org (Postfix) with ESMTPS id 9EA243E0F2A for ; Thu, 17 Feb 2022 17:43:53 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 3473B436E; Thu, 17 Feb 2022 17:43:51 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D35FF1FD3 for ; Thu, 17 Feb 2022 17:43:49 +0000 (UTC) Received: by mail-wr1-f47.google.com with SMTP id u1so10310567wrg.11 for ; Thu, 17 Feb 2022 09:43:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tessares-net.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Z5mCHXlgCr1Jy2Vc+TRuUoNTiJ7IX+SwmRwresxLMD4=; b=eWT1RfGWR5TO2mYUviW03hfaLFuR2Gn6bbCjXlrHX6V7+ewffer284wN1oKAt8DlXS kdIVM6Br5x2O8+VaNMSaWglIDYGD5L6hk1ELH7BGkRb+7uX8eXK9RE1qNHInxAFrifwc o5JgPPrYIIYKCL/IBAlwq2cFHKd78uGn0oIbb5ZhkG+jZF+JXUmxYz11eawT9kGGHA0q aE6OJGSFiHOXYr7DvpUOHFabjscAJ8y+7ab6NbbRTWalDr/CTjuF8hcoibN23nO+WjGY x0NtueptMLLhANWtyl6siAYwJyLkRyjzUEkTwZR7eGfk4KXwUuzqxxbLP/bpG7J/BG/o WbYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Z5mCHXlgCr1Jy2Vc+TRuUoNTiJ7IX+SwmRwresxLMD4=; b=HA1wtreJ0krlSbxgkgQfq2GO1/FnC7Y3OYeE/aDYn5eG5/Y35zXpUXAZ/7K7kkogPC EvwWcDOy49x4SSPulYhS5QesqQLFpnjGz0+Cz6KTGw6lIzx68DpY1ScmSNc9CCepVPzm erGDlaWhrbuWQ5JxUV+cKA2sFdE/YTZTd1d21DEjjMmbQZ+JPrtEslwzrr3xSIaC4RhZ +TM/YipPUrnp9g0xs6kZ+JQSYkEI7n0SiLazuj1MypTGuIXei/bRuI8rrE6Vs3gKh3dY wNPUJu8cLjjvIt15eZF7p/a2kd6RQyzjlFQT1+f7ILiqEDtqkUzAaltNKqXWsXaZE87i rBOA== X-Gm-Message-State: AOAM531FoGC9bBbnE8i3b/4890H13U1/5SO2fQ62S7iqU2eiFgOb72SL acn1K5f54TjZPTaj99n2sB1MH9LKunfnsSaZ X-Received: by 2002:a5d:61d2:0:b0:1e3:c0b7:c3e7 with SMTP id q18-20020a5d61d2000000b001e3c0b7c3e7mr3079085wrv.682.1645119827793; Thu, 17 Feb 2022 09:43:47 -0800 (PST) Received: from tsr-vdi-mbaerts.nix.tessares.net (static.23.216.130.94.clients.your-server.de. [94.130.216.23]) by smtp.gmail.com with ESMTPSA id 7sm23060203wrb.43.2022.02.17.09.43.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Feb 2022 09:43:47 -0800 (PST) From: Matthieu Baerts To: mptcp@lists.linux.dev Cc: Matthieu Baerts Subject: [PATCH mptcp-next v2 3/9] selftests: mptcp: join: reset failing links Date: Thu, 17 Feb 2022 18:43:23 +0100 Message-Id: <20220217174329.826430-4-matthieu.baerts@tessares.net> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220217174329.826430-1-matthieu.baerts@tessares.net> References: <20220217174329.826430-1-matthieu.baerts@tessares.net> 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" Best to always reset this env var before each test to avoid surprising behaviour depending on the order tests are running. Also clearly set it for the last failing links test is also needed when only this test is executed. Signed-off-by: Matthieu Baerts --- tools/testing/selftests/net/mptcp/mptcp_join.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index 747dd6d887ea..6e84750ce3ae 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -23,6 +23,8 @@ declare -A all_tests TEST_COUNT=3D0 nr_blank=3D40 =20 +export FAILING_LINKS=3D"" + # generated using "nfbpf_compile '(ip && (ip[54] & 0xf0) =3D=3D 0x30) || # (ip6 && (ip6[74] & 0xf0) =3D=3D 0x30)'" CBPF_MPTCP_SUBOPTION_ADD_ADDR=3D"14, @@ -63,6 +65,7 @@ init_partial() done =20 check_invert=3D0 + FAILING_LINKS=3D"" =20 # ns1 ns2 # ns1eth1 ns2eth1 @@ -1411,7 +1414,7 @@ link_failure_tests() pm_nl_set_limits $ns1 0 2 pm_nl_add_endpoint $ns1 10.0.2.1 dev ns1eth2 flags signal pm_nl_set_limits $ns2 1 2 - export FAILING_LINKS=3D"1" + FAILING_LINKS=3D"1" pm_nl_add_endpoint $ns2 10.0.3.2 dev ns2eth3 flags subflow,backup run_tests $ns1 $ns2 10.0.1.1 1 chk_join_nr "backup subflow unused, link failure" 2 2 2 @@ -1426,7 +1429,7 @@ link_failure_tests() pm_nl_add_endpoint $ns1 10.0.2.1 dev ns1eth2 flags signal pm_nl_set_limits $ns2 1 2 pm_nl_add_endpoint $ns2 10.0.3.2 dev ns2eth3 flags subflow,backup - export FAILING_LINKS=3D"1 2" + FAILING_LINKS=3D"1 2" run_tests $ns1 $ns2 10.0.1.1 1 chk_join_nr "backup flow used, multi links fail" 2 2 2 chk_add_nr 1 1 @@ -1441,6 +1444,7 @@ link_failure_tests() pm_nl_add_endpoint $ns1 10.0.2.1 dev ns1eth2 flags signal pm_nl_set_limits $ns2 1 3 pm_nl_add_endpoint $ns2 10.0.3.2 dev ns2eth3 flags subflow,backup + FAILING_LINKS=3D"1 2" run_tests $ns1 $ns2 10.0.1.1 2 chk_join_nr "backup flow used, bidi, link failure" 2 2 2 chk_add_nr 1 1 --=20 2.34.1