summaryrefslogtreecommitdiff
path: root/t/t6120-describe.sh
diff options
context:
space:
mode:
authorRamsay Jones <ramsay@ramsayjones.plus.com>2017-09-14 17:24:41 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-09-15 02:52:00 (GMT)
commit21dac1deee58df80f7b2cd17d661864c8db5d28a (patch)
tree568007825f19c4199d09fe7d47f5699f93e2677d /t/t6120-describe.sh
parent31625b34c0e54ae184f28aa5eb5095d21204557e (diff)
downloadgit-21dac1deee58df80f7b2cd17d661864c8db5d28a.zip
git-21dac1deee58df80f7b2cd17d661864c8db5d28a.tar.gz
git-21dac1deee58df80f7b2cd17d661864c8db5d28a.tar.bz2
test-lib: don't use ulimit in test prerequisites on cygwin
On cygwin (and MinGW), the 'ulimit' built-in bash command does not have the desired effect of limiting the resources of new processes, at least for the stack and file descriptors. However, it always returns success and leads to several test prerequisites being erroneously set to true. Add a check for cygwin and MinGW to the prerequisite expressions, using a 'test_have_prereq !MINGW,!CYGWIN' clause, to guard against using ulimit. This affects the prerequisite expressions for the ULIMIT_STACK_SIZE, CMDLINE_LIMIT and ULIMIT_FILE_DESCRIPTORS prerequisites. Signed-off-by: Ramsay Jones <ramsay@ramsayjones.plus.com> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6120-describe.sh')
-rwxr-xr-xt/t6120-describe.sh1
1 files changed, 0 insertions, 1 deletions
diff --git a/t/t6120-describe.sh b/t/t6120-describe.sh
index dd6dd9d..3d45dc2 100755
--- a/t/t6120-describe.sh
+++ b/t/t6120-describe.sh
@@ -279,7 +279,6 @@ test_expect_success 'describe ignoring a borken submodule' '
grep broken out
'
-# we require ulimit, this excludes Windows
test_expect_failure ULIMIT_STACK_SIZE 'name-rev works in a deep repo' '
i=1 &&
while test $i -lt 8000