tyler.durden
/
powerline
mirror of https://github.com/powerline/powerline.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Always supply verb argument

This commit is contained in:
Foo 2017-12-02 19:06:38 +03:00
parent 2a01c4687e
commit cee07a69b1
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tests/shlib/common.sh
View File

@ -47,7 +47,7 @@ exit_suite() {
fi fi
} }
fail() { _fail() {
local allow_failure= local allow_failure=
if test "$1" = "--allow-failure" ; then if test "$1" = "--allow-failure" ; then
shift shift
@ -56,7 +56,7 @@ fail() {
local test_name="$1" ; shift local test_name="$1" ; shift
local fail_char="$allow_failure$1" ; shift local fail_char="$allow_failure$1" ; shift
local message="$1" ; shift local message="$1" ; shift
local verb="${1:-Failed}" ; test $# -ge 1 && shift local verb="$1" ; shift
local full_msg="$fail_char $POWERLINE_CURRENT_SUITE|$test_name :: $message" local full_msg="$fail_char $POWERLINE_CURRENT_SUITE|$test_name :: $message"
FAIL_SUMMARY="${FAIL_SUMMARY}${NL}${full_msg}" FAIL_SUMMARY="${FAIL_SUMMARY}${NL}${full_msg}"
echo "$verb: $full_msg" echo "$verb: $full_msg"
@ -66,10 +66,14 @@ fail() {
fi fi
} }
fail() {
_fail "$@" "Failed"
}
skip() { skip() {
local test_name="$1" ; shift local test_name="$1" ; shift
local message="$1" ; shift local message="$1" ; shift
fail --allow-failure "$test_name" S "$message" "Skipped" _fail --allow-failure "$test_name" S "$message" "Skipped"
} }
make_test_root() { make_test_root() {