Commit e011853d authored by Masami Hiramatsu (Google)'s avatar Masami Hiramatsu (Google) Committed by Shuah Khan
Browse files

selftests/tracing: Fix to make --logdir option work again 



Since commit a0aa283c ("selftest/ftrace: Generalise ftracetest to
use with RV") moved the default LOG_DIR setting after --logdir option
parser, it overwrites the user given LOG_DIR.
This fixes it to check the --logdir option parameter when setting new
default LOG_DIR with a new TOP_DIR.

Fixes: a0aa283c ("selftest/ftrace: Generalise ftracetest to use with RV")
Signed-off-by: default avatarMasami Hiramatsu (Google) <mhiramat@kernel.org>
Tested-by: default avatarGabriele Monaco <gmonaco@redhat.com>
Link: https://lore.kernel.org/r/177071725191.2369897.14781037901532893911.stgit@mhiramat.tok.corp.google.com


Signed-off-by: default avatarShuah Khan <skhan@linuxfoundation.org>
parent 6de23f81

tools/testing/selftests/ftrace/ftracetest

+12 −6
Original line number Diff line number Diff line
@@ -130,8 +130,7 @@ parse_opts() { # opts 
      shift 1

    ;;

    --logdir|-l)

      LOG_DIR=$2

      LINK_PTR=

      USER_LOG_DIR=$2

      shift 2

    ;;

    --rv)
@@ -199,6 +198,7 @@ fi 
TOP_DIR=`absdir $0`

TEST_DIR=$TOP_DIR/test.d

TEST_CASES=`find_testcases $TEST_DIR`

USER_LOG_DIR=

KEEP_LOG=0

KTAP=0

DEBUG=0
@@ -210,12 +210,18 @@ RV_TEST=0 
# Parse command-line options

parse_opts $*



[ $DEBUG -ne 0 ] && set -x



# TOP_DIR can be changed for rv. Setting log directory.

LOG_TOP_DIR=$TOP_DIR/logs

LOG_DATE=`date +%Y%m%d-%H%M%S`

if [ -n "$USER_LOG_DIR" ]; then

  LOG_DIR=$USER_LOG_DIR

  LINK_PTR=

else

  LOG_DIR=$LOG_TOP_DIR/$LOG_DATE/

  LINK_PTR=$LOG_TOP_DIR/latest



[ $DEBUG -ne 0 ] && set -x

fi



if [ $RV_TEST -ne 0 ]; then

	TRACING_DIR=$TRACING_DIR/rv