Merge branch 'sg/test-bash-version-fix'

* sg/test-bash-version-fix:
test-lib: check Bash version for '-x' without using shell arrays

diff --git a/t/test-lib.sh b/t/test-lib.sh
index 0f1faa24b27b90f4d246d33da9950325f8736633..c34831a4deab4cc76916ff8fbafec531607760b5 100644 (file)
--- 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