summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-12-22 11:27:25 -0800
committerJunio C Hamano <gitster@pobox.com>2011-12-22 11:27:25 -0800
commit52b9d2cf7fbde061bf0d3336e3a89d7333d5b23d (patch)
treef9e75a67727f79915c7c1170914bd22ac4ee247f
parentc53d1e49f9b87cbfb7e53b17cd935e8c54469d6b (diff)
parent781f76b15824bb929b6f3f007d8e43894e4980cd (diff)
downloadgit-52b9d2cf7fbde061bf0d3336e3a89d7333d5b23d.tar.gz
Merge branch 'jk/maint-do-not-feed-stdin-to-tests'
* jk/maint-do-not-feed-stdin-to-tests: test-lib: redirect stdin of tests
-rw-r--r--t/test-lib.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/t/test-lib.sh b/t/test-lib.sh
index 0e932dd975..a65dfc7ea9 100644
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -192,6 +192,7 @@ then
fi
exec 5>&1
+exec 6<&0
if test "$verbose" = "t"
then
exec 4>&2 3>&1
@@ -475,7 +476,7 @@ test_debug () {
test_eval_ () {
# This is a separate function because some tests use
# "return" to end a test_expect_success block early.
- eval >&3 2>&4 "$*"
+ eval </dev/null >&3 2>&4 "$*"
}
test_run_ () {