Skip to content

Commit bb20dbb

Browse files
committed
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
2 parents 9f2eba2 + 54ea72f commit bb20dbb

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

t/test-lib.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -323,12 +323,12 @@ do
323323
# this test is marked as such, and ignore '-x' if it
324324
# isn't executed with a suitable Bash version.
325325
if test -z "$test_untraceable" || {
326-
test -n "$BASH_VERSION" && {
326+
test -n "$BASH_VERSION" && eval '
327327
test ${BASH_VERSINFO[0]} -gt 4 || {
328328
test ${BASH_VERSINFO[0]} -eq 4 &&
329329
test ${BASH_VERSINFO[1]} -ge 1
330330
}
331-
}
331+
'
332332
}
333333
then
334334
trace=t

0 commit comments

Comments
 (0)