From nobody Tue Feb 10 06:58:53 2026 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6638:bd2:0:0:0:0 with SMTP id g18csp1565910jad; Thu, 24 Feb 2022 05:56:55 -0800 (PST) X-Google-Smtp-Source: ABdhPJwXeSuSEUNpmQpOgljjev9hCK/WCnNOSxom0RQg0fMy6/vlfogW6K1Hz9WSmp2GrAWICRwJ X-Received: by 2002:a5b:603:0:b0:624:64e1:35c with SMTP id d3-20020a5b0603000000b0062464e1035cmr2499086ybq.455.1645711015578; Thu, 24 Feb 2022 05:56:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645711015; cv=none; d=google.com; s=arc-20160816; b=cwVTJ11VNNQB6pQm1yyBwmV/ZO9kCIjOuk67AiPK4SpQgC6EvM0W9n6gud3Lf6vvWk gqBIiu5PaFq/kiFhvWKHeg4QQ/6a0pzWp328vTd4ojkqlVecGRUGxbzmQBBdFllo9Z2W n7JDv/UWc44aFY5xRq10bqaExpJvW6XVzju+hIb1dvz9uCZVedf/hNSCFezugCfKTkKH G83YISl/FMfQfwsdafTcEm17IlgVNBhJt0C+T44jPaR4u1Ewx0VJ+tcanqa1AmRyL7L1 ILwM6IcI8Mse6RQk30yyzcJCN4ny/LH/1hSzsJbBFUNfPM5OFYt7oMUCtWP61g9jvnF6 Ubfw== 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=tt5AtZfDgzS7v94Fv77l+8XRNXqq9FkUAGIVf/7/K8I=; b=LWw3H/Tgnr+fGczR2WQeazCKWpF2U6vL3eCsHo3kliQ952cYc77c5RK6TQcHVYL2Vp g5pjHXS5M/7PckSyyd/fsRiOwVBEayAw65/Xz9DvRgkacsRfNcRhg59HAJTF4xNOOssi 8xxksOfTj6hlnlvSdrNP4bEo8M3SGwyNEZZsulV1brvj0vt1ErJObfpqPdgTao1xgjkK 0YAhTm95ZMcHasbkJU7Cdw7hWIfh3dbXEMLjJk5K+OwOXW+bOAgOrBIYe6Z/N4ysIu8O iVzmHKw5VNwOXeeMsNnkqLeGmCkD0lhuaKC6WxiuM2OsXO8mQZzJJpuRzwGX9ZtdhSbI mNMA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@tessares-net.20210112.gappssmtp.com header.s=20210112 header.b=AC6pAb1B; spf=pass (google.com: domain of mptcp+bounces-3983-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3983-wpasupplicant.patchew=gmail.com@lists.linux.dev" Return-Path: Received: from ewr.edge.kernel.org (ewr.edge.kernel.org. [2604:1380:1:3600::1]) by mx.google.com with ESMTPS id a82si2186618ybg.101.2022.02.24.05.56.55 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 24 Feb 2022 05:56:55 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3983-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) client-ip=2604:1380:1:3600::1; Authentication-Results: mx.google.com; dkim=pass header.i=@tessares-net.20210112.gappssmtp.com header.s=20210112 header.b=AC6pAb1B; spf=pass (google.com: domain of mptcp+bounces-3983-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3983-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 ewr.edge.kernel.org (Postfix) with ESMTPS id 2EA781C0E38 for ; Thu, 24 Feb 2022 13:56:55 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 7BCB47478; Thu, 24 Feb 2022 13:56:51 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from mail-ed1-f48.google.com (mail-ed1-f48.google.com [209.85.208.48]) (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 162361B62 for ; Thu, 24 Feb 2022 13:56:49 +0000 (UTC) Received: by mail-ed1-f48.google.com with SMTP id cm8so2974097edb.3 for ; Thu, 24 Feb 2022 05:56: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=tt5AtZfDgzS7v94Fv77l+8XRNXqq9FkUAGIVf/7/K8I=; b=AC6pAb1BX0RYEi/0jVIp0YJU/g38we6kE/9tqkWeUTDiGyRdVyd/lFKwUpNXqW+K1V ggNA8F/osXzvm/VM27qrAZmvnizVXf+giwb+JZ3E2JW4nK/xqF74BESpiCvjV1y4/lYi U702dKIyqv6l8pDiSCjqagGFwGBZB9F9l+6i9DdTM0vnnYhIkTdVKS57T+GxL8oc/LYX ngB9Tpnx8QRLbRQdkRlLmr7+VaMbfCA2Aghowkg5bbLJ5Br2hmkC8+tQnCrnbob8Miz2 68bZBlJkMngOkQ/DUGdbz1HxK7obd7gg0e6VPI7tVu9k2djPH5RJ8AHDA9UcsfSrYpo5 cCtw== 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=tt5AtZfDgzS7v94Fv77l+8XRNXqq9FkUAGIVf/7/K8I=; b=XQRGn9Qe69wyR/5EXV03K5+LuiGgutpsN9+cqLmVtOFr0KDgRVYz+wr9ntm/JTsopK 7PDCFZ+cRVMvZvnUnMVM2p33aBW+byZexIeoSRIlHJmNvqnkI6b4ghdBc87fBAL9q8IK 9zBNnNVR0TOWYDATIOPPSgv95y8j8ZvBsap9i5mpvvJikK952o2UJBCoKRY1Htlwnttq w5QPDYBBy8u9mYtqbBMorHEbys0haKayqeObPlRttiMHcQC94wLOK49pVTc/tL+Jey46 Aw7ZvzLB94qOOPFz3QEtRwzWcDJs9SpCi4jH43CyOeaKIxFNznKh50tMNE7daY1mVjJM /78A== X-Gm-Message-State: AOAM5313V0Foy/cWn8X84zYlaMFNViPTbc2vR1vx7g5LJBO4coBv5Hhz vn7gWHoy2Ts4WxrAmwrriI3IFiWD+2kg6R+tU1Y= X-Received: by 2002:a05:6402:d0d:b0:412:d49c:74d3 with SMTP id eb13-20020a0564020d0d00b00412d49c74d3mr2389866edb.207.1645711007996; Thu, 24 Feb 2022 05:56: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 7sm1360733edw.37.2022.02.24.05.56.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Feb 2022 05:56:47 -0800 (PST) From: Matthieu Baerts To: mptcp@lists.linux.dev Cc: Matthieu Baerts , Mat Martineau Subject: [PATCH mptcp-next v3 05/12] selftests: mptcp: join: reset failing links Date: Thu, 24 Feb 2022 14:56:12 +0100 Message-Id: <20220224135619.2523272-6-matthieu.baerts@tessares.net> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220224135619.2523272-1-matthieu.baerts@tessares.net> References: <20220224135619.2523272-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. Reviewed-by: Mat Martineau 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 9d14851f9732..eb6735e2d570 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, @@ -64,6 +66,7 @@ init_partial() =20 check_invert=3D0 validate_checksum=3D$checksum + FAILING_LINKS=3D"" =20 # ns1 ns2 # ns1eth1 ns2eth1 @@ -1712,7 +1715,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 @@ -1727,7 +1730,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 @@ -1742,6 +1745,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