Commit 1efa82ec authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'ftracetest-3.18-rc1' of...

Merge tag 'ftracetest-3.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace

Pull ftracetest fix from Steven Rostedt:
 "Running the ftracetests on a machine that had the debugfs file system
  mounted in two locations caused the ftracetests to fail.  This is
  because the ftracetests script does a grep of the /proc/mounts file to
  find where the debugfs file system is mounted.  If it is mounted
  twice, then the grep returns two lines instead of just one.  This
  causes the ftracetests to get confused and fail.

  Use "head -1" to only return the first mount point for debugfs"

* tag 'ftracetest-3.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
  ftracetest: Take the first debugfs mount found
parents 980d0d51 e7dbb489
...@@ -82,7 +82,7 @@ parse_opts() { # opts ...@@ -82,7 +82,7 @@ parse_opts() { # opts
} }
# Parameters # 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 TRACING_DIR=$DEBUGFS_DIR/tracing
TOP_DIR=`absdir $0` TOP_DIR=`absdir $0`
TEST_DIR=$TOP_DIR/test.d TEST_DIR=$TOP_DIR/test.d
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment