Commit 2cca8751 authored by Petr Machata's avatar Petr Machata Committed by David S. Miller
Browse files

selftests: forwarding: devlink_lib: Avoid double sourcing of lib.sh 



Don't source lib.sh twice and make the script work with ifnames passed
on the command line.

Signed-off-by: default avatarPetr Machata <petrm@mellanox.com>
Signed-off-by: default avatarIdo Schimmel <idosch@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2fcbc0b1

tools/testing/selftests/drivers/net/mlxsw/spectrum-2/tc_flower.sh

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ ALL_TESTS="single_mask_test identical_filters_test two_masks_test \ 
	delta_two_masks_one_key_test delta_simple_rehash_test \

	bloom_simple_test bloom_complex_test bloom_delta_test"

NUM_NETIFS=2

source $lib_dir/lib.sh

source $lib_dir/tc_common.sh

source $lib_dir/devlink_lib.sh

tools/testing/selftests/drivers/net/mlxsw/spectrum/devlink_resources.sh

+3 −0
Original line number Diff line number Diff line 
#!/bin/bash

# SPDX-License-Identifier: GPL-2.0



lib_dir=$(dirname $0)/../../../../net/forwarding



NUM_NETIFS=1

source $lib_dir/lib.sh

source devlink_lib_spectrum.sh



setup_prepare()

tools/testing/selftests/drivers/net/mlxsw/spectrum/resource_scale.sh

+4 −1
Original line number Diff line number Diff line 
#!/bin/bash

# SPDX-License-Identifier: GPL-2.0



lib_dir=$(dirname $0)/../../../../net/forwarding



NUM_NETIFS=6

source ../../../../net/forwarding/tc_common.sh

source $lib_dir/lib.sh

source $lib_dir/tc_common.sh

source devlink_lib_spectrum.sh



current_test=""

tools/testing/selftests/net/forwarding/devlink_lib.sh

+0 −10
Original line number Diff line number Diff line 
#!/bin/bash

# SPDX-License-Identifier: GPL-2.0



##############################################################################

# Source library



relative_path="${BASH_SOURCE%/*}"

if [[ "$relative_path" == "${BASH_SOURCE}" ]]; then

	relative_path="."

fi



source "$relative_path/lib.sh"



##############################################################################

# Defines

CRA Git | Maintained and supported by SUSTech CRA and CCSE