Re: [PATCH net-next 2/6] selftests: bonding: Add net/forwarding/lib.sh to TEST_INCLUDES

[Hangbin Liu <liuhangbin@gmail.com>]

On Wed, Jan 24, 2024 at 12:02:18PM -0500, 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 and
> include it via its relative path.
> 
> Reviewed-by: Petr Machata <petrm@nvidia.com>
> Tested-by: Petr Machata <petrm@nvidia.com>
> Signed-off-by: Benjamin Poirier <bpoirier@nvidia.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

I wonder if we should still call it lib_dir. Maybe

selftest_dir="$(dirname "$0")/../../.."
source $selftest_dir/net/forwarding/lib.sh

But this is absolutely out of this patch set's scope :)

Thanks
Hangbin