diff options
author | Steven Rostedt (Red Hat) <rostedt@goodmis.org> | 2014-10-31 18:02:05 -0400 |
---|---|---|
committer | Steven Rostedt <rostedt@goodmis.org> | 2014-11-03 13:42:49 -0500 |
commit | e7dbb48958897c0a80b14250a981a563d9160e4d (patch) | |
tree | e679714789ebae73bc88f3c7a8a45e15521309d8 | |
parent | 89c5497d1f933af56dac617f0fd86150942a7fb6 (diff) | |
download | op-kernel-dev-e7dbb48958897c0a80b14250a981a563d9160e4d.zip op-kernel-dev-e7dbb48958897c0a80b14250a981a563d9160e4d.tar.gz |
ftracetest: Take the first debugfs mount found
Running ftracetests on a box that mounted debugfs in two locations
made the ftracetests fail. This is because the tests uses a grep
of debugfs from the /proc/mounts file to find the debugfs mount
point, and then appends "/tracing" to that string to get the tracing
directory.
If the debugfs directory is mounted twice, then that grep will return
two answers and appending "/tracing" to a string with two lines will
not work.
Use "head -1" to only take the first mount point found.
Acked-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
-rwxr-xr-x | tools/testing/selftests/ftrace/ftracetest | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/testing/selftests/ftrace/ftracetest b/tools/testing/selftests/ftrace/ftracetest index a8f81c7..5152476 100755 --- a/tools/testing/selftests/ftrace/ftracetest +++ b/tools/testing/selftests/ftrace/ftracetest @@ -82,7 +82,7 @@ parse_opts() { # opts } # Parameters -DEBUGFS_DIR=`grep debugfs /proc/mounts | cut -f2 -d' '` +DEBUGFS_DIR=`grep debugfs /proc/mounts | cut -f2 -d' ' | head -1` TRACING_DIR=$DEBUGFS_DIR/tracing TOP_DIR=`absdir $0` TEST_DIR=$TOP_DIR/test.d |