diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-03-06 22:54:05 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-03-06 22:54:05 (GMT) |
| commit | 148bce96e58a80fcf3a36d0cb70e0bd24ba6cfb6 (patch) | |
| tree | 1f27aa29391199ab52a7cdb02b0c731328969589 /t | |
| parent | e33c3322b669cb7b67a9d54b5e576c525115a650 (diff) | |
| parent | 03aa3783f258737c02e0b3aba34bb4c9ed8c07dc (diff) | |
| download | git-148bce96e58a80fcf3a36d0cb70e0bd24ba6cfb6.zip git-148bce96e58a80fcf3a36d0cb70e0bd24ba6cfb6.tar.gz git-148bce96e58a80fcf3a36d0cb70e0bd24ba6cfb6.tar.bz2 | |
Merge branch 'jk/test-helper-v-output-fix'
Test framework update.
* jk/test-helper-v-output-fix:
t: send verbose test-helper output to fd 4
Diffstat (limited to 't')
| -rw-r--r-- | t/test-lib-functions.sh | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh index 8a8a932..42a6781 100644 --- a/t/test-lib-functions.sh +++ b/t/test-lib-functions.sh @@ -633,22 +633,22 @@ test_must_fail () { exit_code=$? if test $exit_code -eq 0 && ! list_contains "$_test_ok" success then - echo >&2 "test_must_fail: command succeeded: $*" + echo >&4 "test_must_fail: command succeeded: $*" return 1 elif test_match_signal 13 $exit_code && list_contains "$_test_ok" sigpipe then return 0 elif test $exit_code -gt 129 && test $exit_code -le 192 then - echo >&2 "test_must_fail: died by signal $(($exit_code - 128)): $*" + echo >&4 "test_must_fail: died by signal $(($exit_code - 128)): $*" return 1 elif test $exit_code -eq 127 then - echo >&2 "test_must_fail: command not found: $*" + echo >&4 "test_must_fail: command not found: $*" return 1 elif test $exit_code -eq 126 then - echo >&2 "test_must_fail: valgrind error: $*" + echo >&4 "test_must_fail: valgrind error: $*" return 1 fi return 0 @@ -688,7 +688,7 @@ test_expect_code () { return 0 fi - echo >&2 "test_expect_code: command exited with $exit_code, we wanted $want_code $*" + echo >&4 "test_expect_code: command exited with $exit_code, we wanted $want_code $*" return 1 } @@ -752,18 +752,18 @@ test_i18ngrep () { shift ! grep "$@" && return 0 - echo >&2 "error: '! grep $@' did find a match in:" + echo >&4 "error: '! grep $@' did find a match in:" else grep "$@" && return 0 - echo >&2 "error: 'grep $@' didn't find a match in:" + echo >&4 "error: 'grep $@' didn't find a match in:" fi if test -s "$last_arg" then - cat >&2 "$last_arg" + cat >&4 "$last_arg" else - echo >&2 "<File '$last_arg' is empty>" + echo >&4 "<File '$last_arg' is empty>" fi return 1 @@ -774,7 +774,7 @@ test_i18ngrep () { # not output anything when they fail. verbose () { "$@" && return 0 - echo >&2 "command failed: $(git rev-parse --sq-quote "$@")" + echo >&4 "command failed: $(git rev-parse --sq-quote "$@")" return 1 } |