Merge branch 'maint-2.5' into maint-2.6

diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh
index 0e80f377cec63a74ea357dc881e62b1d66e33d7f..6dffb8bcde83b82fa40b05dd8ee815f4e6a3cdd3 100644 (file)
--- a/t/test-lib-functions.sh
+++ b/t/test-lib-functions.sh
@@ -736,6 +736,11 @@ test_seq () {
 # what went wrong.
 
 test_when_finished () {
+       # We cannot detect when we are in a subshell in general, but by
+       # doing so on Bash is better than nothing (the test will
+       # silently pass on other shells).
+       test "${BASH_SUBSHELL-0}" = 0 ||
+       error "bug in test script: test_when_finished does nothing in a subshell"
        test_cleanup="{ $*
                } && (exit \"\$eval_ret\"); eval_ret=\$?; $test_cleanup"
 }