diff options
| author |  Elia Pinto <gitter.spiros@gmail.com> | 2014-06-06 07:56:02 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2014-06-09 15:53:42 -0700 |
| commit | 0cfe6fd252ee0898d832823bdab66d3cc986f3df (patch) | |
| tree | 8f5e5e8da4f814fc7a3be751d87a006e138f0050 | |
| parent | t/t9814-git-p4-rename.sh: avoid "test <cond> -a/-o <cond>" (diff) | |
| download | tgif-0cfe6fd252ee0898d832823bdab66d3cc986f3df.tar.xz | |
t/test-lib-functions.sh: avoid "test <cond> -a/-o <cond>"
The construct is error-prone; "test" being built-in in most modern
shells, the reason to avoid "test <cond> && test <cond>" spawning
one extra process by using a single "test <cond> -a <cond>" no
longer exists.
Signed-off-by: Elia Pinto <gitter.spiros@gmail.com>
Reviewed-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | t/test-lib-functions.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh index 158e10a67e..0681003b34 100644 --- a/t/test-lib-functions.sh +++ b/t/test-lib-functions.sh @@ -542,7 +542,7 @@ test_must_fail () { 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 + elif test $exit_code -gt 129 && test $exit_code -le 192; then echo >&2 "test_must_fail: died by signal: $*" return 1 elif test $exit_code = 127; then @@ -569,7 +569,7 @@ test_must_fail () { test_might_fail () { "$@" exit_code=$? - if test $exit_code -gt 129 -a $exit_code -le 192; then + if test $exit_code -gt 129 && test $exit_code -le 192; then echo >&2 "test_might_fail: died by signal: $*" return 1 elif test $exit_code = 127; then |