diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2018-05-15 16:30:17 +0300 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2018-05-15 16:30:17 +0300 |
| commit | 291c161f6c65530092903fbea58eb07a62b220ba (patch) | |
| tree | 5b2186b7e7faf257e7184348f0217060de09ce88 /tools/perf/tests | |
| parent | eaeb1f4d892936133c5f8d3aafb36b7f384fe59c (diff) | |
| parent | f3903c9161f0d636a7b0ff03841628928457e64c (diff) | |
| download | linux-291c161f6c65530092903fbea58eb07a62b220ba.tar.xz | |
Merge remote-tracking branch 'tip/perf/urgent' into perf/core
To pick up fixes, notably the revert for the intel_pt//u regression.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/tests')
| -rwxr-xr-x | tools/perf/tests/shell/record+probe_libc_inet_pton.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/tests/shell/record+probe_libc_inet_pton.sh b/tools/perf/tests/shell/record+probe_libc_inet_pton.sh index 016882dbbc16..ee86473643be 100755 --- a/tools/perf/tests/shell/record+probe_libc_inet_pton.sh +++ b/tools/perf/tests/shell/record+probe_libc_inet_pton.sh @@ -16,7 +16,7 @@ nm -g $libc 2>/dev/null | fgrep -q inet_pton || exit 254 trace_libc_inet_pton_backtrace() { idx=0 expected[0]="ping[][0-9 \.:]+probe_libc:inet_pton: \([[:xdigit:]]+\)" - expected[1]=".*inet_pton[[:space:]]\($libc\)$" + expected[1]=".*inet_pton[[:space:]]\($libc|inlined\)$" case "$(uname -m)" in s390x) eventattr='call-graph=dwarf,max-stack=4' |