From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp-relay-internal-1.canonical.com (smtp-relay-internal-1.canonical.com [185.125.188.123]) (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 2D13F39B for ; Sat, 27 Jan 2024 00:29:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.125.188.123 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706315352; cv=none; b=VpbOhW8PDYDAjk0hikeB84LrTckZglZ2Li/uoc1l3nJ5ynctfJaXE5hM4cI3LFY0BMgrlRL7Xl/gz7oNLIPS2DAzRxS0kt9pFDNHQMARX7TROggaQD6fb5Fz98YHskeUBK7VFc/yoSIZNI+Y8q5mw1Fw0LDMDlUgYVdJ6ni2UY0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706315352; c=relaxed/simple; bh=5sEVI83xY5mvEPW0c9LA+P8zBPvgkiJ/KHpqkDMlQSw=; h=From:To:cc:Subject:In-reply-to:References:MIME-Version: Content-Type:Date:Message-ID; b=s5vXbGEiTJ1Ff4WQq2CzuW+ZQxNxWQQIpk4zOe3JPgj5JLH6bP2MO+7G25und47PuCgljPe6IGJiehs/5jnaoySxQMx9+wNVX+0ALo80MeGxxxjgV1lBEzLPI6IZcFQQ2vxilNKynCaZVRGzOj296tsUUPE55wSTuEDsMwiiW2c= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canonical.com; spf=pass smtp.mailfrom=canonical.com; dkim=pass (2048-bit key) header.d=canonical.com header.i=@canonical.com header.b=n7CGtsvJ; arc=none smtp.client-ip=185.125.188.123 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canonical.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=canonical.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=canonical.com header.i=@canonical.com header.b="n7CGtsvJ" Received: from mail-ot1-f72.google.com (mail-ot1-f72.google.com [209.85.210.72]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id CC68841DEB for ; Sat, 27 Jan 2024 00:28:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1706315337; bh=2zuptboPtpFHfDSk/+RxWCV8mwfG174WDOUFcRIK/LA=; h=From:To:cc:Subject:In-reply-to:References:MIME-Version: Content-Type:Date:Message-ID; b=n7CGtsvJX5lFAlCs7MaSBUMfuJa4Qu//XUO9I+dFs3GttetGEryGA6w28lcycBca0 7KU8SNBKz7w004tK1qecQumTfeTo5EGgPq2C72Bk3CA+nVT0nWd/RTnO1A+xkoOpn0 rgr8892P004yOmosGWQIZghA4zl94oiDFFVJQtD1kjUVeFTHhoE2b/099M0gdUT5v3 9cESHwMQWfVMg3Q83lJQFhfpm2aQJ61ttyTr3Epau1KZADhdR1YLi9vh19jiUitDtZ g/smXMBCdcvE/lcrSQesdJgelTZAIcdWRG6lxkPJyD1aJXnzjrdEagVsCqcU02oDWI AXgzI4fyyqsyQ== Received: by mail-ot1-f72.google.com with SMTP id 46e09a7af769-6e110db764aso907005a34.2 for ; Fri, 26 Jan 2024 16:28:57 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706315336; x=1706920136; h=message-id:date:content-transfer-encoding:content-id:mime-version :comments:references:in-reply-to:subject:cc:to:from :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=2zuptboPtpFHfDSk/+RxWCV8mwfG174WDOUFcRIK/LA=; b=FEZ6kurzsRpHHuFqxGk4jr24lecKWT5+htCrQx4Wddx2RijG4fqh6ut1MLs3HMjzpq NjerYKuzKARoM4i3/DSQ39T3GH7+0HDCCm8lepE4TRl0uC3itGz191FQTR4ypaTKyFdU 9m6+EYVT1pAY46/13Gvqtr61W4KtV2xoNCY3RNBDzhqXThhZnw0C88CS3JgCyCo6OAvO c/asY1v0CYeTh4ChjI1G+yez5ogThv1LukIdM7hiU3KqRI3J/ZpwzDFdWEF2W3BCPRly uRxqb/URTOci+rHPDi2WfFJPdTU2oSSGj+Sp+w9tinZwHnZMqB29FOItaHKubv1jX9uD bH0w== X-Gm-Message-State: AOJu0YzvgF2SvVvAeCQBZ73nUPcKbTCftOYn01vAxqcAZSg1BxEbRJx6 3iHYd8RY9e07gcdtf0VwYMj1KUublFgvaQvlZaYpBYdKi++3lR1RvIjowtBSom4W3/jZ1uzKjfx c8AwGbJBGE4M0zc/O30DVRNoqEXNNxhHscSxAaZO24jCVjnUz/4dKEu+iLNX3sHrigrDDqA== X-Received: by 2002:a9d:7357:0:b0:6db:cffe:8e8b with SMTP id l23-20020a9d7357000000b006dbcffe8e8bmr615363otk.10.1706315336229; Fri, 26 Jan 2024 16:28:56 -0800 (PST) X-Google-Smtp-Source: AGHT+IEUfOnZGAiFGpCrG45elfBXGx2d9Hp07QRzna4M9tsXtxq/mI6ptycgdeexO2oAnUbioKTH2A== X-Received: by 2002:a9d:7357:0:b0:6db:cffe:8e8b with SMTP id l23-20020a9d7357000000b006dbcffe8e8bmr615343otk.10.1706315335994; Fri, 26 Jan 2024 16:28:55 -0800 (PST) Received: from famine.localdomain ([50.125.80.253]) by smtp.gmail.com with ESMTPSA id ln8-20020a056a003cc800b006dddf2ed8f0sm1670154pfb.154.2024.01.26.16.28.55 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 26 Jan 2024 16:28:55 -0800 (PST) Received: by famine.localdomain (Postfix, from userid 1000) id 29ADB5FFF6; Fri, 26 Jan 2024 16:28:55 -0800 (PST) Received: from famine (localhost [127.0.0.1]) by famine.localdomain (Postfix) with ESMTP id 237949FB50; Fri, 26 Jan 2024 16:28:55 -0800 (PST) From: Jay Vosburgh To: Benjamin Poirier cc: netdev@vger.kernel.org, Shuah Khan , Jonathan Corbet , Andy Gospodarek , Andrew Lunn , Florian Fainelli , Vladimir Oltean , Jiri Pirko , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Petr Machata , Danielle Ratson , Nikolay Aleksandrov , Ido Schimmel , Johannes Nixdorf , Davide Caratti , Tobias Waldekranz , Zahari Doychev , Hangbin Liu , linux-kselftest@vger.kernel.org, linux-doc@vger.kernel.org Subject: Re: [PATCH net-next v2 2/6] selftests: bonding: Add net/forwarding/lib.sh to TEST_INCLUDES In-reply-to: <20240126232123.769784-3-bpoirier@nvidia.com> References: <20240126232123.769784-1-bpoirier@nvidia.com> <20240126232123.769784-3-bpoirier@nvidia.com> Comments: In-reply-to Benjamin Poirier message dated "Fri, 26 Jan 2024 18:21:19 -0500." X-Mailer: MH-E 8.6+git; nmh 1.6; Emacs 29.0.50 Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-ID: <11807.1706315335.1@famine> Content-Transfer-Encoding: quoted-printable Date: Fri, 26 Jan 2024 16:28:55 -0800 Message-ID: <11808.1706315335@famine> Benjamin Poirier wrote: >In order to avoid duplicated files when both the bonding and forwarding >tests are exported together, add net/forwarding/lib.sh to TEST_INCLUDES a= nd >include it via its relative path. > >Reviewed-by: Petr Machata >Tested-by: Petr Machata >Reviewed-by: Hangbin Liu >Signed-off-by: Benjamin Poirier Reviewed-by: Jay Vosburgh >--- > tools/testing/selftests/drivers/net/bonding/Makefile | 6 ++++-- > .../selftests/drivers/net/bonding/bond-eth-type-change.sh | 2 +- > .../testing/selftests/drivers/net/bonding/bond_topo_2d1c.sh | 2 +- > .../testing/selftests/drivers/net/bonding/dev_addr_lists.sh | 2 +- > .../drivers/net/bonding/mode-1-recovery-updelay.sh | 2 +- > .../drivers/net/bonding/mode-2-recovery-updelay.sh | 2 +- > .../selftests/drivers/net/bonding/net_forwarding_lib.sh | 1 - > 7 files changed, 9 insertions(+), 8 deletions(-) > delete mode 120000 tools/testing/selftests/drivers/net/bonding/net_forwa= rding_lib.sh > >diff --git a/tools/testing/selftests/drivers/net/bonding/Makefile b/tools= /testing/selftests/drivers/net/bonding/Makefile >index 8a72bb7de70f..1e10a1f06faf 100644 >--- a/tools/testing/selftests/drivers/net/bonding/Makefile >+++ b/tools/testing/selftests/drivers/net/bonding/Makefile >@@ -15,7 +15,9 @@ TEST_PROGS :=3D \ > TEST_FILES :=3D \ > lag_lib.sh \ > bond_topo_2d1c.sh \ >- bond_topo_3d1c.sh \ >- net_forwarding_lib.sh >+ bond_topo_3d1c.sh >+ >+TEST_INCLUDES :=3D \ >+ ../../../net/forwarding/lib.sh > = > include ../../../lib.mk >diff --git a/tools/testing/selftests/drivers/net/bonding/bond-eth-type-ch= ange.sh b/tools/testing/selftests/drivers/net/bonding/bond-eth-type-change= .sh >index 862e947e17c7..8293dbc7c18f 100755 >--- a/tools/testing/selftests/drivers/net/bonding/bond-eth-type-change.sh >+++ b/tools/testing/selftests/drivers/net/bonding/bond-eth-type-change.sh >@@ -11,7 +11,7 @@ ALL_TESTS=3D" > REQUIRE_MZ=3Dno > NUM_NETIFS=3D0 > lib_dir=3D$(dirname "$0") >-source "$lib_dir"/net_forwarding_lib.sh >+source "$lib_dir"/../../../net/forwarding/lib.sh > = > bond_check_flags() > { >diff --git a/tools/testing/selftests/drivers/net/bonding/bond_topo_2d1c.s= h b/tools/testing/selftests/drivers/net/bonding/bond_topo_2d1c.sh >index a509ef949dcf..0eb7edfb584c 100644 >--- a/tools/testing/selftests/drivers/net/bonding/bond_topo_2d1c.sh >+++ b/tools/testing/selftests/drivers/net/bonding/bond_topo_2d1c.sh >@@ -28,7 +28,7 @@ > REQUIRE_MZ=3Dno > NUM_NETIFS=3D0 > lib_dir=3D$(dirname "$0") >-source ${lib_dir}/net_forwarding_lib.sh >+source "$lib_dir"/../../../net/forwarding/lib.sh > = > s_ns=3D"s-$(mktemp -u XXXXXX)" > c_ns=3D"c-$(mktemp -u XXXXXX)" >diff --git a/tools/testing/selftests/drivers/net/bonding/dev_addr_lists.s= h b/tools/testing/selftests/drivers/net/bonding/dev_addr_lists.sh >index 5cfe7d8ebc25..e6fa24eded5b 100755 >--- a/tools/testing/selftests/drivers/net/bonding/dev_addr_lists.sh >+++ b/tools/testing/selftests/drivers/net/bonding/dev_addr_lists.sh >@@ -14,7 +14,7 @@ ALL_TESTS=3D" > REQUIRE_MZ=3Dno > NUM_NETIFS=3D0 > lib_dir=3D$(dirname "$0") >-source "$lib_dir"/net_forwarding_lib.sh >+source "$lib_dir"/../../../net/forwarding/lib.sh > = > source "$lib_dir"/lag_lib.sh > = >diff --git a/tools/testing/selftests/drivers/net/bonding/mode-1-recovery-= updelay.sh b/tools/testing/selftests/drivers/net/bonding/mode-1-recovery-u= pdelay.sh >index b76bf5030952..9d26ab4cad0b 100755 >--- a/tools/testing/selftests/drivers/net/bonding/mode-1-recovery-updelay= .sh >+++ b/tools/testing/selftests/drivers/net/bonding/mode-1-recovery-updelay= .sh >@@ -23,7 +23,7 @@ REQUIRE_MZ=3Dno > REQUIRE_JQ=3Dno > NUM_NETIFS=3D0 > lib_dir=3D$(dirname "$0") >-source "$lib_dir"/net_forwarding_lib.sh >+source "$lib_dir"/../../../net/forwarding/lib.sh > source "$lib_dir"/lag_lib.sh > = > cleanup() >diff --git a/tools/testing/selftests/drivers/net/bonding/mode-2-recovery-= updelay.sh b/tools/testing/selftests/drivers/net/bonding/mode-2-recovery-u= pdelay.sh >index 8c2619002147..2d275b3e47dd 100755 >--- a/tools/testing/selftests/drivers/net/bonding/mode-2-recovery-updelay= .sh >+++ b/tools/testing/selftests/drivers/net/bonding/mode-2-recovery-updelay= .sh >@@ -23,7 +23,7 @@ REQUIRE_MZ=3Dno > REQUIRE_JQ=3Dno > NUM_NETIFS=3D0 > lib_dir=3D$(dirname "$0") >-source "$lib_dir"/net_forwarding_lib.sh >+source "$lib_dir"/../../../net/forwarding/lib.sh > source "$lib_dir"/lag_lib.sh > = > cleanup() >diff --git a/tools/testing/selftests/drivers/net/bonding/net_forwarding_l= ib.sh b/tools/testing/selftests/drivers/net/bonding/net_forwarding_lib.sh >deleted file mode 120000 >index 39c96828c5ef..000000000000 >--- a/tools/testing/selftests/drivers/net/bonding/net_forwarding_lib.sh >+++ /dev/null >@@ -1 +0,0 @@ >-../../../net/forwarding/lib.sh >\ No newline at end of file >-- = >2.43.0 > >