diff options
| author |   Yuval Mintz <yuvalm@mellanox.com> | 2018-06-30 02:45:19 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2018-06-30 22:06:15 +0900 |
| commit | 87d8fb18cbe919342a1909a1e4168c9a63b9bbbf (patch) | |
| tree | 36ff604c720291bda8e2615886c15c5fffebf5b8 /tools/testing/selftests/net/forwarding/lib.sh | |
| parent | Merge branch 'nfp-flower-updates-and-netconsole' (diff) | |
| download | linux-dev-87d8fb18cbe919342a1909a1e4168c9a63b9bbbf.tar.xz linux-dev-87d8fb18cbe919342a1909a1e4168c9a63b9bbbf.zip | |
selftests: forwarding: Allow lib.sh sourcing from other directories
The devlink related scripts are mlxsw-specific. As a result, they'll
reside in a different directory - but would still need the common logic
implemented in lib.sh.
So as a preliminary step, allow lib.sh to be sourced from other
directories as well.
Signed-off-by: Yuval Mintz <yuvalm@mellanox.com>
Signed-off-by: Petr Machata <petrm@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'tools/testing/selftests/net/forwarding/lib.sh')
| -rw-r--r-- | tools/testing/selftests/net/forwarding/lib.sh | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/tools/testing/selftests/net/forwarding/lib.sh b/tools/testing/selftests/net/forwarding/lib.sh index d1f14f83979e..59272824ef37 100644 --- a/tools/testing/selftests/net/forwarding/lib.sh +++ b/tools/testing/selftests/net/forwarding/lib.sh @@ -14,8 +14,13 @@ PAUSE_ON_CLEANUP=${PAUSE_ON_CLEANUP:=no} NETIF_TYPE=${NETIF_TYPE:=veth} NETIF_CREATE=${NETIF_CREATE:=yes} -if [[ -f forwarding.config ]]; then - source forwarding.config +relative_path="${BASH_SOURCE%/*}" +if [[ "$relative_path" == "${BASH_SOURCE}" ]]; then + relative_path="." +fi + +if [[ -f $relative_path/forwarding.config ]]; then + source "$relative_path/forwarding.config" fi ############################################################################## |