summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-01-18 21:49:54 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-01-18 21:49:54 (GMT)
commitbb20dbbc2089b33bd3ed83fb700fa5dfe76a5c0e (patch)
tree7e4efab0c0c980411a66b457e585700f735f2a78
parent9f2eba2b90d7af573e1a86c6974db4fe33acbfe1 (diff)
parent54ea72f09c34eea6646af886b8efb06ddcee5299 (diff)
downloadgit-bb20dbbc2089b33bd3ed83fb700fa5dfe76a5c0e.zip
git-bb20dbbc2089b33bd3ed83fb700fa5dfe76a5c0e.tar.gz
git-bb20dbbc2089b33bd3ed83fb700fa5dfe76a5c0e.tar.bz2
Merge branch 'sg/test-bash-version-fix'
The test suite tried to see if it is run under bash, but the check itself failed under some other implementations of shell (notably under NetBSD). This has been corrected. * sg/test-bash-version-fix: test-lib: check Bash version for '-x' without using shell arrays
-rw-r--r--t/test-lib.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/t/test-lib.sh b/t/test-lib.sh
index 0f1faa2..c34831a 100644
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -323,12 +323,12 @@ do
# this test is marked as such, and ignore '-x' if it
# isn't executed with a suitable Bash version.
if test -z "$test_untraceable" || {
- test -n "$BASH_VERSION" && {
+ test -n "$BASH_VERSION" && eval '
test ${BASH_VERSINFO[0]} -gt 4 || {
test ${BASH_VERSINFO[0]} -eq 4 &&
test ${BASH_VERSINFO[1]} -ge 1
}
- }
+ '
}
then
trace=t