From: Jay Vosburgh <jay.vosburgh@canonical.com>
To: Benjamin Poirier <bpoirier@nvidia.com>
Cc: netdev@vger.kernel.org, Shuah Khan <shuah@kernel.org>,
Jonathan Corbet <corbet@lwn.net>,
Andy Gospodarek <andy@greyhouse.net>,
Andrew Lunn <andrew@lunn.ch>,
Florian Fainelli <f.fainelli@gmail.com>,
Vladimir Oltean <olteanv@gmail.com>,
Jiri Pirko <jiri@resnulli.us>,
"David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
Petr Machata <petrm@nvidia.com>,
Danielle Ratson <danieller@nvidia.com>,
Nikolay Aleksandrov <razor@blackwall.org>,
Ido Schimmel <idosch@nvidia.com>,
Johannes Nixdorf <jnixdorf-oss@avm.de>,
Davide Caratti <dcaratti@redhat.com>,
Tobias Waldekranz <tobias@waldekranz.com>,
Zahari Doychev <zdoychev@maxlinear.com>,
Hangbin Liu <liuhangbin@gmail.com>,
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
Date: Fri, 26 Jan 2024 16:28:55 -0800 [thread overview]
Message-ID: <11808.1706315335@famine> (raw)
In-Reply-To: <20240126232123.769784-3-bpoirier@nvidia.com>
Benjamin Poirier <bpoirier@nvidia.com> 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 and
>include it via its relative path.
>
>Reviewed-by: Petr Machata <petrm@nvidia.com>
>Tested-by: Petr Machata <petrm@nvidia.com>
>Reviewed-by: Hangbin Liu <liuhangbin@gmail.com>
>Signed-off-by: Benjamin Poirier <bpoirier@nvidia.com>
Reviewed-by: Jay Vosburgh <jay.vosburgh@canonical.com>
>---
> 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_forwarding_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 := \
> TEST_FILES := \
> lag_lib.sh \
> bond_topo_2d1c.sh \
>- bond_topo_3d1c.sh \
>- net_forwarding_lib.sh
>+ bond_topo_3d1c.sh
>+
>+TEST_INCLUDES := \
>+ ../../../net/forwarding/lib.sh
>
> include ../../../lib.mk
>diff --git a/tools/testing/selftests/drivers/net/bonding/bond-eth-type-change.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="
> REQUIRE_MZ=no
> NUM_NETIFS=0
> lib_dir=$(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.sh 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=no
> NUM_NETIFS=0
> lib_dir=$(dirname "$0")
>-source ${lib_dir}/net_forwarding_lib.sh
>+source "$lib_dir"/../../../net/forwarding/lib.sh
>
> s_ns="s-$(mktemp -u XXXXXX)"
> c_ns="c-$(mktemp -u XXXXXX)"
>diff --git a/tools/testing/selftests/drivers/net/bonding/dev_addr_lists.sh 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="
> REQUIRE_MZ=no
> NUM_NETIFS=0
> lib_dir=$(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-updelay.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=no
> REQUIRE_JQ=no
> NUM_NETIFS=0
> lib_dir=$(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-updelay.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=no
> REQUIRE_JQ=no
> NUM_NETIFS=0
> lib_dir=$(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_lib.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
>
>
next prev parent reply other threads:[~2024-01-27 0:29 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-26 23:21 [PATCH net-next v2 0/6] selftests: Add TEST_INCLUDES directive and adjust tests to use it Benjamin Poirier
2024-01-26 23:21 ` [PATCH net-next v2 1/6] selftests: Introduce Makefile variable to list shared bash scripts Benjamin Poirier
2024-01-26 23:21 ` [PATCH net-next v2 2/6] selftests: bonding: Add net/forwarding/lib.sh to TEST_INCLUDES Benjamin Poirier
2024-01-27 0:28 ` Jay Vosburgh [this message]
2024-01-26 23:21 ` [PATCH net-next v2 3/6] selftests: team: Add shared library scripts " Benjamin Poirier
2024-01-26 23:21 ` [PATCH net-next v2 4/6] selftests: dsa: Replace test symlinks by wrapper script Benjamin Poirier
2024-01-26 23:21 ` [PATCH net-next v2 5/6] selftests: forwarding: Redefine relative_path variable Benjamin Poirier
2024-01-26 23:21 ` [PATCH net-next v2 6/6] selftests: forwarding: Remove duplicated lib.sh content Benjamin Poirier
2024-01-31 11:00 ` [PATCH net-next v2 0/6] selftests: Add TEST_INCLUDES directive and adjust tests to use it patchwork-bot+netdevbpf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=11808.1706315335@famine \
--to=jay.vosburgh@canonical.com \
--cc=andrew@lunn.ch \
--cc=andy@greyhouse.net \
--cc=bpoirier@nvidia.com \
--cc=corbet@lwn.net \
--cc=danieller@nvidia.com \
--cc=davem@davemloft.net \
--cc=dcaratti@redhat.com \
--cc=edumazet@google.com \
--cc=f.fainelli@gmail.com \
--cc=idosch@nvidia.com \
--cc=jiri@resnulli.us \
--cc=jnixdorf-oss@avm.de \
--cc=kuba@kernel.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=liuhangbin@gmail.com \
--cc=netdev@vger.kernel.org \
--cc=olteanv@gmail.com \
--cc=pabeni@redhat.com \
--cc=petrm@nvidia.com \
--cc=razor@blackwall.org \
--cc=shuah@kernel.org \
--cc=tobias@waldekranz.com \
--cc=zdoychev@maxlinear.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).