diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-23 19:30:30 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-23 19:30:30 -0700 |
| commit | 4496a1d9638644484d0d99e9de63742248f3c119 (patch) | |
| tree | 12be3c6029a8973a4315a02c0835bc63dc5b1525 /tools | |
| parent | d6542d76ec88dde3305b06c03952d87b15bbc292 (diff) | |
| parent | 97f8827a8c7963756ae7d3ee898675b4667eca73 (diff) | |
| download | linux-4496a1d9638644484d0d99e9de63742248f3c119.tar.gz linux-4496a1d9638644484d0d99e9de63742248f3c119.tar.bz2 linux-4496a1d9638644484d0d99e9de63742248f3c119.zip | |
Merge tag 'trace-v4.7-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace
Pull tracing fix from Steven Rostedt:
"Reviewing the selftest I recently submitted, I realize that the second
part of it uses my old hack to get the PID of the spawned background
tasks, which doesn't work for all shells, instead of the common use of
$!"
* tag 'trace-v4.7-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
ftracetest: Use proper logic to find process PID
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/testing/selftests/ftrace/test.d/instances/instance-event.tc | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/tools/testing/selftests/ftrace/test.d/instances/instance-event.tc b/tools/testing/selftests/ftrace/test.d/instances/instance-event.tc index 5f2abd03f16b..4c5a061a5b4e 100644 --- a/tools/testing/selftests/ftrace/test.d/instances/instance-event.tc +++ b/tools/testing/selftests/ftrace/test.d/instances/instance-event.tc @@ -92,28 +92,23 @@ instance_slam() { } instance_slam & -x=`jobs -l` -p1=`echo $x | cut -d' ' -f2` +p1=$! echo $p1 instance_slam & -x=`jobs -l | tail -1` -p2=`echo $x | cut -d' ' -f2` +p2=$! echo $p2 instance_slam & -x=`jobs -l | tail -1` -p3=`echo $x | cut -d' ' -f2` +p3=$! echo $p3 instance_slam & -x=`jobs -l | tail -1` -p4=`echo $x | cut -d' ' -f2` +p4=$! echo $p4 instance_slam & -x=`jobs -l | tail -1` -p5=`echo $x | cut -d' ' -f2` +p5=$! echo $p5 ls -lR >/dev/null |