openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

selftests: forwarding: move shblock tc support check to a separate helper 

The shared block support is only needed for tc_shblock.sh. No need to
require that for other test.

Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jiri Pirko 2018-07-23 09:24:05 +02:00 committed by David S. Miller
parent e2f2a1fd5b
commit 7f333cbf2b
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tools/testing/selftests/net/forwarding/lib.sh
View File

@ -33,7 +33,10 @@ check_tc_version()
echo "SKIP: iproute2 too old; tc is missing JSON support" echo "SKIP: iproute2 too old; tc is missing JSON support"
exit 1 exit 1
fi fi
}
check_tc_shblock_support()
{
tc filter help 2>&1 | grep block &> /dev/null tc filter help 2>&1 | grep block &> /dev/null
if [[ $? -ne 0 ]]; then if [[ $? -ne 0 ]]; then
echo "SKIP: iproute2 too old; tc is missing shared block support" echo "SKIP: iproute2 too old; tc is missing shared block support"

2
tools/testing/selftests/net/forwarding/tc_shblocks.sh
View File

@ -105,6 +105,8 @@ cleanup()
ip link set $swp2 address $swp2origmac ip link set $swp2 address $swp2origmac
} }
check_tc_shblock_support
trap cleanup EXIT trap cleanup EXIT
setup_prepare setup_prepare