Commit 3dbb16b8 authored by Masami Hiramatsu's avatar Masami Hiramatsu Committed by Steven Rostedt

selftests: ftrace: Shift down default message verbosity

Shift down default message verbosity, where it does not show
error results in stdout by default. Since that behavior
is the same as giving the --quiet option, this patch removes
--quiet and makes --verbose increasing verbosity.

In other words, this changes verbosity options as below.
ftracetest -q -> ftracetest
ftracetest    -> ftracetest -v
ftracetest -v -> ftracetest -v -v (or -vv)

Link: http://lkml.kernel.org/r/148007872763.5917.15256235993753860592.stgit@devboxAcked-by: default avatarShuah Khan <shuahkh@osg.samsung.com>
Signed-off-by: default avatarMasami Hiramatsu <mhiramat@kernel.org>
Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
parent d4d7ccc8
...@@ -13,8 +13,8 @@ echo "Usage: ftracetest [options] [testcase(s)] [testcase-directory(s)]" ...@@ -13,8 +13,8 @@ echo "Usage: ftracetest [options] [testcase(s)] [testcase-directory(s)]"
echo " Options:" echo " Options:"
echo " -h|--help Show help message" echo " -h|--help Show help message"
echo " -k|--keep Keep passed test logs" echo " -k|--keep Keep passed test logs"
echo " -v|--verbose Show all stdout messages in testcases" echo " -v|--verbose Increase verbosity of test messages"
echo " -q|--quiet Do not show error log on stdout" echo " -vv Alias of -v -v (Show all results in stdout)"
echo " -d|--debug Debug mode (trace all shell commands)" echo " -d|--debug Debug mode (trace all shell commands)"
exit $1 exit $1
} }
...@@ -55,12 +55,9 @@ parse_opts() { # opts ...@@ -55,12 +55,9 @@ parse_opts() { # opts
KEEP_LOG=1 KEEP_LOG=1
shift 1 shift 1
;; ;;
--verbose|-v) --verbose|-v|-vv)
VERBOSE=1 VERBOSE=$((VERBOSE + 1))
shift 1 [ $1 == '-vv' ] && VERBOSE=$((VERBOSE + 1))
;;
--quiet|-q)
BE_QUIET=1
shift 1 shift 1
;; ;;
--debug|-d) --debug|-d)
...@@ -106,7 +103,6 @@ LOG_DIR=$TOP_DIR/logs/`date +%Y%m%d-%H%M%S`/ ...@@ -106,7 +103,6 @@ LOG_DIR=$TOP_DIR/logs/`date +%Y%m%d-%H%M%S`/
KEEP_LOG=0 KEEP_LOG=0
DEBUG=0 DEBUG=0
VERBOSE=0 VERBOSE=0
BE_QUIET=0
# Parse command-line options # Parse command-line options
parse_opts $* parse_opts $*
...@@ -246,7 +242,7 @@ run_test() { # testfile ...@@ -246,7 +242,7 @@ run_test() { # testfile
testcase $1 testcase $1
echo "execute: "$1 > $testlog echo "execute: "$1 > $testlog
SIG_RESULT=0 SIG_RESULT=0
if [ $VERBOSE -ne 0 ]; then if [ $VERBOSE -ge 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
...@@ -256,7 +252,7 @@ run_test() { # testfile ...@@ -256,7 +252,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
[ $BE_QUIET -eq 0 ] && catlog $testlog [ $VERBOSE -ge 1 ] && 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