From: Elia Pinto <gitter.spiros@gmail.com> Date: Fri, 6 Jun 2014 14:56:02 +0000 (-0700) Subject: t/test-lib-functions.sh: avoid "test <cond> -a/-o <cond>" X-Git-Tag: v2.1.0-rc0~79^2~2 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/0cfe6fd252ee0898d832823bdab66d3cc986f3df 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> --- 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