Skip to content

Commit

Permalink
Merge tag 'trace-v4.7-3' of git://git.kernel.org/pub/scm/linux/kernel…
Browse files Browse the repository at this point in the history
…/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
  • Loading branch information
torvalds committed May 24, 2016
2 parents d6542d7 + 97f8827 commit 4496a1d
Showing 1 changed file with 5 additions and 10 deletions.
15 changes: 5 additions & 10 deletions tools/testing/selftests/ftrace/test.d/instances/instance-event.tc
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 4496a1d

Please sign in to comment.