diff options
| author | David S. Miller <davem@davemloft.net> | 2018-06-04 10:08:46 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-06-04 10:08:46 -0400 |
| commit | 1ec23c5407f1f901b64cb9b7549a2ba4a36d613e (patch) | |
| tree | 6408c3d2b5ee92f205ca5fca9bcbefb9cd546e81 | |
| parent | 8284fd4cb85577eecca024fe1e7a35b39ed0f3f5 (diff) | |
| parent | 6ebe5a7a66ebd78f83fdd231a1d50bfc7a93598e (diff) | |
| download | linux-1ec23c5407f1f901b64cb9b7549a2ba4a36d613e.tar.bz2 | |
Merge branch 'selftests-mirror_vlan-fixes'
Petr Machata says:
====================
selftests: forwarding: mirror_vlan: Fixlets
This patchset includes two small fixes for the tests that were
introduced in commit 1bb58d2d3cbe ("Merge branch
'Mirroring-tests-involving-VLAN'").
In patch #1, a "tc action trap" is uninstalled after the suite runs,
instead of being installed again.
In patch #2, a test in suite is renamed to differentiate it from another
test of the same name.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rwxr-xr-x | tools/testing/selftests/net/forwarding/mirror_vlan.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/testing/selftests/net/forwarding/mirror_vlan.sh b/tools/testing/selftests/net/forwarding/mirror_vlan.sh index 20b37a53657e..9ab2ce77b332 100755 --- a/tools/testing/selftests/net/forwarding/mirror_vlan.sh +++ b/tools/testing/selftests/net/forwarding/mirror_vlan.sh @@ -91,7 +91,7 @@ test_tagged_vlan_dir() 192.0.2.17 192.0.2.18 mirror_uninstall $swp1 $direction - log_test "$direction mirror to vlan ($tcflags)" + log_test "$direction mirror tagged to vlan ($tcflags)" } test_tagged_vlan() @@ -108,7 +108,7 @@ test_all() tests_run - trap_install $h3 ingress + trap_uninstall $h3 ingress slow_path_trap_uninstall $swp1 egress slow_path_trap_uninstall $swp1 ingress } |