diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-11-04 11:12:25 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-11-04 11:12:25 -0800 |
| commit | 1efa82ecb621a819b552cf541fc5169c44816a6d (patch) | |
| tree | 98d339067e4bebac15cfcb4db70a879257b1bba9 /tools/testing | |
| parent | 980d0d51b1c9617a472b2c0fcbe33d2d15eadc4c (diff) | |
| parent | e7dbb48958897c0a80b14250a981a563d9160e4d (diff) | |
| download | linux-1efa82ecb621a819b552cf541fc5169c44816a6d.tar.gz linux-1efa82ecb621a819b552cf541fc5169c44816a6d.tar.bz2 linux-1efa82ecb621a819b552cf541fc5169c44816a6d.zip | |
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
Diffstat (limited to 'tools/testing')
| -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 a8f81c782856..515247601df4 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 |