Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 198979be authored by David Ahern's avatar David Ahern Committed by David S. Miller
Browse files

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: default avatarDavid Ahern <dsahern@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5f6f845b

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

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
# SPDX-License-Identifier: GPL-2.0



NUM_NETIFS=4

CHECK_TC="yes"

source lib.sh



h1_create()

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

+18 −11
Original line number Diff line number Diff line
@@ -19,26 +19,33 @@ fi 
##############################################################################

# Sanity checks



if [[ "$(id -u)" -ne 0 ]]; then

	echo "SKIP: need root privileges"

	exit 0

fi



check_tc_version()

{

	tc -j &> /dev/null

	if [[ $? -ne 0 ]]; then

	echo "SKIP: iproute2 too old, missing JSON support"

	exit 0

		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, missing shared block support"

		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



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

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

+1 −1
Original line number Diff line number Diff line
@@ -2,8 +2,8 @@ 
# SPDX-License-Identifier: GPL-2.0



NUM_NETIFS=4

source lib.sh

source tc_common.sh

source lib.sh



tcflags="skip_hw"

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

+1 −1
Original line number Diff line number Diff line
@@ -2,8 +2,8 @@ 
# SPDX-License-Identifier: GPL-2.0



NUM_NETIFS=2

source lib.sh

source tc_common.sh

source lib.sh



tcflags="skip_hw"

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

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

# SPDX-License-Identifier: GPL-2.0



CHECK_TC="yes"



tc_check_packets()

{

	local id=$1