diff options
author | Li Zhijian <zhijianx.li@intel.com> | 2021-11-19 09:24:57 +0300 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2021-11-22 15:36:00 +0300 |
commit | ac2944abe4d7732f29a79f063c9cae7df2a3e3cc (patch) | |
tree | 2949fd8b7a0773b005198ed84be144988d12b282 /tools/testing/selftests/tc-testing/tc-tests/actions | |
parent | bdf1565fe03d29777d24e239163d0d53e4af9ce0 (diff) | |
download | linux-ac2944abe4d7732f29a79f063c9cae7df2a3e3cc.tar.xz |
selftests/tc-testings: Be compatible with newer tc output
old tc(iproute2-5.9.0) output:
action order 1: bpf action.o:[action-ok] id 60 tag bcf7977d3b93787c jited default-action pipe
newer tc(iproute2-5.14.0) output:
action order 1: bpf action.o:[action-ok] id 64 name tag bcf7977d3b93787c jited default-action pipe
It can fix below errors:
# ok 260 f84a - Add cBPF action with invalid bytecode
# not ok 261 e939 - Add eBPF action with valid object-file
# Could not match regex pattern. Verify command output:
# total acts 0
#
# action order 1: bpf action.o:[action-ok] id 42 name tag bcf7977d3b93787c jited default-action pipe
# index 667 ref 1 bind 0
Signed-off-by: Li Zhijian <zhijianx.li@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'tools/testing/selftests/tc-testing/tc-tests/actions')
-rw-r--r-- | tools/testing/selftests/tc-testing/tc-tests/actions/bpf.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/testing/selftests/tc-testing/tc-tests/actions/bpf.json b/tools/testing/selftests/tc-testing/tc-tests/actions/bpf.json index 503982b8f295..91832400ddbd 100644 --- a/tools/testing/selftests/tc-testing/tc-tests/actions/bpf.json +++ b/tools/testing/selftests/tc-testing/tc-tests/actions/bpf.json @@ -68,7 +68,7 @@ "cmdUnderTest": "$TC action add action bpf object-file $EBPFDIR/action.o section action-ok index 667", "expExitCode": "0", "verifyCmd": "$TC action get action bpf index 667", - "matchPattern": "action order [0-9]*: bpf action.o:\\[action-ok\\] id [0-9]* tag [0-9a-f]{16}( jited)? default-action pipe.*index 667 ref", + "matchPattern": "action order [0-9]*: bpf action.o:\\[action-ok\\] id [0-9].* tag [0-9a-f]{16}( jited)? default-action pipe.*index 667 ref", "matchCount": "1", "teardown": [ "$TC action flush action bpf" |