undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jk/test-must-fail-missing'

Browse Source 
* jk/test-must-fail-missing:
  tests: make test_might_fail fail on missing commands
  tests: make test_might_fail more verbose
  tests: make test_must_fail fail on missing commands
  tests: make test_must_fail more verbose
This commit is contained in:
Junio C Hamano 2010-09-08 09:17:01 -07:00
commit 1080be268b
1 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
t/test-lib.sh
View File

@ -620,7 +620,18 @@ test_path_is_missing () {
test_must_fail () {
"$@"
test $? -gt 0 -a $? -le 129 -o $? -gt 192
exit_code=$?
if test $exit_code = 0; then
echo >&2 "test_must_fail: command succeeded: $*"
return 1
elif test $exit_code -gt 129 -a $exit_code -le 192; then
echo >&2 "test_must_fail: died by signal: $*"
return 1
elif test $exit_code = 127; then
echo >&2 "test_must_fail: command not found: $*"
return 1
fi
return 0
}
# Similar to test_must_fail, but tolerates success, too. This is
@ -636,7 +647,15 @@ test_must_fail () {
test_might_fail () {
"$@"
test $? -ge 0 -a $? -le 129 -o $? -gt 192
exit_code=$?
if test $exit_code -gt 129 -a $exit_code -le 192; then
echo >&2 "test_might_fail: died by signal: $*"
return 1
elif test $exit_code = 127; then
echo >&2 "test_might_fail: command not found: $*"
return 1
fi
return 0
}
# test_cmp is a helper function to compare actual and expected output.