Merge branch 'sg/test-bash-version-fix'
* sg/test-bash-version-fix: test-lib: check Bash version for '-x' without using shell arrays
This commit is contained in:
commit
54ea72f09c
@ -323,12 +323,12 @@ do
|
|||||||
# this test is marked as such, and ignore '-x' if it
|
# this test is marked as such, and ignore '-x' if it
|
||||||
# isn't executed with a suitable Bash version.
|
# isn't executed with a suitable Bash version.
|
||||||
if test -z "$test_untraceable" || {
|
if test -z "$test_untraceable" || {
|
||||||
test -n "$BASH_VERSION" && {
|
test -n "$BASH_VERSION" && eval '
|
||||||
test ${BASH_VERSINFO[0]} -gt 4 || {
|
test ${BASH_VERSINFO[0]} -gt 4 || {
|
||||||
test ${BASH_VERSINFO[0]} -eq 4 &&
|
test ${BASH_VERSINFO[0]} -eq 4 &&
|
||||||
test ${BASH_VERSINFO[1]} -ge 1
|
test ${BASH_VERSINFO[1]} -ge 1
|
||||||
}
|
}
|
||||||
}
|
'
|
||||||
}
|
}
|
||||||
then
|
then
|
||||||
trace=t
|
trace=t
|
||||||
|
Loading…
Reference in New Issue
Block a user