diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2019-01-18 13:49:54 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-01-18 13:49:54 -0800 |
| commit | bb20dbbc2089b33bd3ed83fb700fa5dfe76a5c0e (patch) | |
| tree | 7e4efab0c0c980411a66b457e585700f735f2a78 | |
| parent | Merge branch 'rb/hpe' (diff) | |
| parent | Merge branch 'sg/test-bash-version-fix' (diff) | |
| download | tgif-bb20dbbc2089b33bd3ed83fb700fa5dfe76a5c0e.tar.xz | |
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.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/test-lib.sh b/t/test-lib.sh index 0f1faa24b2..c34831a4de 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 |