Skip to content

Commit

Permalink
perf test shell: Replace '|&' with '2>&1 |' to work with more shells
Browse files Browse the repository at this point in the history
Since we do not specify bash (and/or zsh) as a requirement, use the
standard error redirection that is more widely supported.

Signed-off-by: Kim Phillips <[email protected]>
Link: http://lkml.kernel.org/n/[email protected]
Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
  • Loading branch information
kim-phillips-arm authored and acmel committed Aug 16, 2017
1 parent db26984 commit 35435cd
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion tools/perf/tests/shell/lib/probe.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Arnaldo Carvalho de Melo <[email protected]>, 2017

skip_if_no_perf_probe() {
perf probe |& grep -q 'is not a perf-command' && return 2
perf probe 2>&1 | grep -q 'is not a perf-command' && return 2
return 0
}
4 changes: 2 additions & 2 deletions tools/perf/tests/shell/lib/probe_vfs_getname.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Arnaldo Carvalho de Melo <[email protected]>, 2017

perf probe -l |& grep -q probe:vfs_getname
perf probe -l 2>&1 | grep -q probe:vfs_getname
had_vfs_getname=$?

cleanup_probe_vfs_getname() {
Expand All @@ -12,7 +12,7 @@ cleanup_probe_vfs_getname() {
add_probe_vfs_getname() {
local verbose=$1
if [ $had_vfs_getname -eq 1 ] ; then
line=$(perf probe -L getname_flags |& egrep 'result.*=.*filename;' | sed -r 's/[[:space:]]+([[:digit:]]+)[[:space:]]+result->uptr.*/\1/')
line=$(perf probe -L getname_flags 2>&1 | egrep 'result.*=.*filename;' | sed -r 's/[[:space:]]+([[:digit:]]+)[[:space:]]+result->uptr.*/\1/')
perf probe $verbose "vfs_getname=getname_flags:${line} pathname=result->name:string"
fi
}
Expand Down
2 changes: 1 addition & 1 deletion tools/perf/tests/shell/trace+probe_libc_inet_pton.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ trace_libc_inet_pton_backtrace() {
expected[7]="getaddrinfo[[:space:]]\(/usr/lib.*/libc-[0-9]+\.[0-9]+\.so\)$"
expected[8]=".*\(.*/bin/ping.*\)$"

perf trace --no-syscalls -e probe_libc:inet_pton/max-stack=3/ ping -6 -c 1 ::1 |& grep -v ^$ | while read line ; do
perf trace --no-syscalls -e probe_libc:inet_pton/max-stack=3/ ping -6 -c 1 ::1 2>&1 | grep -v ^$ | while read line ; do
echo $line
echo "$line" | egrep -q "${expected[$idx]}"
if [ $? -ne 0 ] ; then
Expand Down

0 comments on commit 35435cd

Please sign in to comment.