Commit dab24fb1 authored by Masami Hiramatsu's avatar Masami Hiramatsu Committed by Shuah Khan

selftests: ftrace: Add more verbosity for immediate log

Add 3-level verbosity for showing traced command log
on console immediately. Since some test cases can cause
kernel pacic if there is a probrem (like regression etc.),
we can not know which command caused the problem without
traced command log. This verbosity (-vvv) solves that
because it shows the log on console immediately. User
can get continuous command/error log.

Note that this is a kind of kernel debug mode, if you
don't see any kernel related issue, you don't need this
verbosity.
Signed-off-by: default avatarMasami Hiramatsu <mhiramat@kernel.org>
Acked-by: default avatarSteven Rostedt (VMware) <srostedt@goodmis.org>
Signed-off-by: default avatarShuah Khan <shuahkh@osg.samsung.com>
parent 9aa94139
...@@ -15,6 +15,7 @@ echo " -h|--help Show help message" ...@@ -15,6 +15,7 @@ echo " -h|--help Show help message"
echo " -k|--keep Keep passed test logs" echo " -k|--keep Keep passed test logs"
echo " -v|--verbose Increase verbosity of test messages" echo " -v|--verbose Increase verbosity of test messages"
echo " -vv Alias of -v -v (Show all results in stdout)" echo " -vv Alias of -v -v (Show all results in stdout)"
echo " -vvv Alias of -v -v -v (Show all commands immediately)"
echo " --fail-unsupported Treat UNSUPPORTED as a failure" echo " --fail-unsupported Treat UNSUPPORTED as a failure"
echo " -d|--debug Debug mode (trace all shell commands)" echo " -d|--debug Debug mode (trace all shell commands)"
echo " -l|--logdir <dir> Save logs on the <dir>" echo " -l|--logdir <dir> Save logs on the <dir>"
...@@ -57,9 +58,10 @@ parse_opts() { # opts ...@@ -57,9 +58,10 @@ parse_opts() { # opts
KEEP_LOG=1 KEEP_LOG=1
shift 1 shift 1
;; ;;
--verbose|-v|-vv) --verbose|-v|-vv|-vvv)
VERBOSE=$((VERBOSE + 1)) VERBOSE=$((VERBOSE + 1))
[ $1 = '-vv' ] && VERBOSE=$((VERBOSE + 1)) [ $1 = '-vv' ] && VERBOSE=$((VERBOSE + 1))
[ $1 = '-vvv' ] && VERBOSE=$((VERBOSE + 2))
shift 1 shift 1
;; ;;
--debug|-d) --debug|-d)
...@@ -258,7 +260,9 @@ run_test() { # testfile ...@@ -258,7 +260,9 @@ run_test() { # testfile
testcase $1 testcase $1
echo "execute$INSTANCE: "$1 > $testlog echo "execute$INSTANCE: "$1 > $testlog
SIG_RESULT=0 SIG_RESULT=0
if [ $VERBOSE -ge 2 ]; then if [ $VERBOSE -ge 3 ]; then
__run_test $1 | tee -a $testlog 2>&1
elif [ $VERBOSE -eq 2 ]; then
__run_test $1 2>> $testlog | tee -a $testlog __run_test $1 2>> $testlog | tee -a $testlog
else else
__run_test $1 >> $testlog 2>&1 __run_test $1 >> $testlog 2>&1
...@@ -268,7 +272,7 @@ run_test() { # testfile ...@@ -268,7 +272,7 @@ run_test() { # testfile
# Remove test log if the test was done as it was expected. # Remove test log if the test was done as it was expected.
[ $KEEP_LOG -eq 0 ] && rm $testlog [ $KEEP_LOG -eq 0 ] && rm $testlog
else else
[ $VERBOSE -ge 1 ] && catlog $testlog [ $VERBOSE -eq 1 -o $VERBOSE -eq 2 ] && catlog $testlog
TOTAL_RESULT=1 TOTAL_RESULT=1
fi fi
rm -rf $TMPDIR rm -rf $TMPDIR
......
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