| From ea4109e6fbd3a7f78e6dcd305c909f077e82cdb6 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Fri, 23 Apr 2021 14:19:45 +0200 |
| Subject: selftests: mlxsw: Remove a redundant if statement in tc_flower_scale |
| test |
| |
| From: Danielle Ratson <danieller@nvidia.com> |
| |
| [ Upstream commit 1f1c92139e36223b89d8140f2b72f75e79baf8bd ] |
| |
| Currently, the error return code of the failure condition is lost after |
| using an if statement, so the test doesn't fail when it should. |
| |
| Remove the if statement that separates the condition and the error code |
| check, so the test won't always pass. |
| |
| Fixes: abfce9e062021 ("selftests: mlxsw: Reduce running time using offload indication") |
| Reported-by: Ido Schimmel <idosch@nvidia.com> |
| Signed-off-by: Danielle Ratson <danieller@nvidia.com> |
| Reviewed-by: Petr Machata <petrm@nvidia.com> |
| Signed-off-by: Petr Machata <petrm@nvidia.com> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| .../testing/selftests/drivers/net/mlxsw/tc_flower_scale.sh | 6 +----- |
| 1 file changed, 1 insertion(+), 5 deletions(-) |
| |
| diff --git a/tools/testing/selftests/drivers/net/mlxsw/tc_flower_scale.sh b/tools/testing/selftests/drivers/net/mlxsw/tc_flower_scale.sh |
| index cc0f07e72cf2..aa74be9f47c8 100644 |
| --- a/tools/testing/selftests/drivers/net/mlxsw/tc_flower_scale.sh |
| +++ b/tools/testing/selftests/drivers/net/mlxsw/tc_flower_scale.sh |
| @@ -98,11 +98,7 @@ __tc_flower_test() |
| jq -r '[ .[] | select(.kind == "flower") | |
| .options | .in_hw ]' | jq .[] | wc -l) |
| [[ $((offload_count - 1)) -eq $count ]] |
| - if [[ $should_fail -eq 0 ]]; then |
| - check_err $? "Offload mismatch" |
| - else |
| - check_err_fail $should_fail $? "Offload more than expacted" |
| - fi |
| + check_err_fail $should_fail $? "Attempt to offload $count rules (actual result $((offload_count - 1)))" |
| } |
| |
| tc_flower_test() |
| -- |
| 2.30.2 |
| |