diff options
| author |   David Ahern <dsahern@gmail.com> | 2018-03-01 13:49:30 -0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2018-03-01 21:19:02 -0500 |
| commit | 198979be6c16aa62025d5a47680f2c7849b7e64c (patch) | |
| tree | ac773524647c2cbd5c5c8fbb0b1d827308c35063 /tools/testing/selftests/net/forwarding/lib.sh | |
| parent | fib_rules: FRA_GENERIC_POLICY updates for ip proto, sport and dport attrs (diff) | |
| download | linux-dev-198979be6c16aa62025d5a47680f2c7849b7e64c.tar.xz linux-dev-198979be6c16aa62025d5a47680f2c7849b7e64c.zip | |
selftests: forwarding: Only check tc version for tc tests
Capabilities of tc command are irrelevant for router tests:
$ ./router.sh
SKIP: iproute2 too old, missing shared block support
Add a CHECK_TC flag and only check tc capabilities if set. Add flag to
tc_common.sh and have it sourced before lib.sh
Also, if the command lacks some feature the test should exit non-0.
Signed-off-by: David Ahern <dsahern@gmail.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 | 29 |
1 files changed, 18 insertions, 11 deletions
diff --git a/tools/testing/selftests/net/forwarding/lib.sh b/tools/testing/selftests/net/forwarding/lib.sh index 23866a685f77..d0af52109360 100644 --- a/tools/testing/selftests/net/forwarding/lib.sh +++ b/tools/testing/selftests/net/forwarding/lib.sh @@ -19,26 +19,33 @@ fi ############################################################################## # Sanity checks +check_tc_version() +{ + tc -j &> /dev/null + if [[ $? -ne 0 ]]; then + echo "SKIP: iproute2 too old; tc is missing JSON support" + exit 1 + fi + + tc filter help 2>&1 | grep block &> /dev/null + if [[ $? -ne 0 ]]; then + echo "SKIP: iproute2 too old; tc is missing shared block support" + exit 1 + fi +} + if [[ "$(id -u)" -ne 0 ]]; then echo "SKIP: need root privileges" exit 0 fi -tc -j &> /dev/null -if [[ $? -ne 0 ]]; then - echo "SKIP: iproute2 too old, missing JSON support" - exit 0 -fi - -tc filter help 2>&1 | grep block &> /dev/null -if [[ $? -ne 0 ]]; then - echo "SKIP: iproute2 too old, missing shared block support" - exit 0 +if [[ "$CHECK_TC" = "yes" ]]; then + check_tc_version fi if [[ ! -x "$(command -v jq)" ]]; then echo "SKIP: jq not installed" - exit 0 + exit 1 fi if [[ ! -x "$(command -v $MZ)" ]]; then |