Messages in this thread | | | Subject | Re: [PATCH 1/2] kselftests/ftrace: Detect tracefs mount point | From | Shuah Khan <> | Date | Tue, 10 May 2016 09:24:51 -0600 |
| |
On 05/10/2016 08:53 AM, Namhyung Kim wrote: > Currently ftracetest assumes tracing directory is located under > $DEBUGFS/tracing. But it's possible to mount tracefs directly without > debugfs. > > Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Looks good to me. Steve! Ack if you are good with this patch. I can get this into 4.8-rc1
thanks, -- Shuah
> --- > tools/testing/selftests/ftrace/ftracetest | 9 +++++++-- > 1 file changed, 7 insertions(+), 2 deletions(-) > > diff --git a/tools/testing/selftests/ftrace/ftracetest b/tools/testing/selftests/ftrace/ftracetest > index da48812ab95e..4c6a0bf8ba79 100755 > --- a/tools/testing/selftests/ftrace/ftracetest > +++ b/tools/testing/selftests/ftrace/ftracetest > @@ -88,7 +88,12 @@ parse_opts() { # opts > > # Parameters > DEBUGFS_DIR=`grep debugfs /proc/mounts | cut -f2 -d' ' | head -1` > -TRACING_DIR=$DEBUGFS_DIR/tracing > +if [ -z "$DEBUGFS_DIR" ]; then > + TRACING_DIR=`grep tracefs /proc/mounts | cut -f2 -d' ' | head -1` > +else > + TRACING_DIR=$DEBUGFS_DIR/tracing > +fi > + > TOP_DIR=`absdir $0` > TEST_DIR=$TOP_DIR/test.d > TEST_CASES=`find_testcases $TEST_DIR` > @@ -102,7 +107,7 @@ parse_opts $* > [ $DEBUG -ne 0 ] && set -x > > # Verify parameters > -if [ -z "$DEBUGFS_DIR" -o ! -d "$TRACING_DIR" ]; then > +if [ -z "$TRACING_DIR" -o ! -d "$TRACING_DIR" ]; then > errexit "No ftrace directory found" > fi > >
| |