test-lib: don't use ulimit in test prerequisites on cygwin

ramsay-jones · gitster · commit 21dac1deee58 · 2017-09-15T11:52:00.000+09:00
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 &lt;ramsay@ramsayjones.plus.com&gt;
Reviewed-by: Jonathan Nieder &lt;jrnieder@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/t/t1400-update-ref.sh b/t/t1400-update-ref.sh
@@ -1253,7 +1253,10 @@ run_with_limited_open_files () {
 	(ulimit -n 32 && "$@")
 }
 
-test_lazy_prereq ULIMIT_FILE_DESCRIPTORS 'run_with_limited_open_files true'
+test_lazy_prereq ULIMIT_FILE_DESCRIPTORS '
+	test_have_prereq !MINGW,!CYGWIN &&
+	run_with_limited_open_files true
+'
 
 test_expect_success ULIMIT_FILE_DESCRIPTORS 'large transaction creating branches does not burst open file limit' '
 (
diff --git 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
diff --git a/t/t7004-tag.sh b/t/t7004-tag.sh
@@ -1863,7 +1863,6 @@ test_expect_success 'version sort with very long prerelease suffix' '
 	git tag -l --sort=version:refname
 '
 
-# we require ulimit, this excludes Windows
 test_expect_success ULIMIT_STACK_SIZE '--contains and --no-contains work in a deep repo' '
 	>expect &&
 	i=1 &&
diff --git a/t/test-lib.sh b/t/test-lib.sh
@@ -1165,13 +1165,19 @@ run_with_limited_cmdline () {
 	(ulimit -s 128 && "$@")
 }
 
-test_lazy_prereq CMDLINE_LIMIT 'run_with_limited_cmdline true'
+test_lazy_prereq CMDLINE_LIMIT '
+	test_have_prereq !MINGW,!CYGWIN &&
+	run_with_limited_cmdline true
+'
 
 run_with_limited_stack () {
 	(ulimit -s 128 && "$@")
 }
 
-test_lazy_prereq ULIMIT_STACK_SIZE 'run_with_limited_stack true'
+test_lazy_prereq ULIMIT_STACK_SIZE '
+	test_have_prereq !MINGW,!CYGWIN &&
+	run_with_limited_stack true
+'
 
 build_option () {
 	git version --build-options |

Original file line number	Diff line number	Diff line change
`@@ -1253,7 +1253,10 @@ run_with_limited_open_files () {`
`1253`	`1253`	`(ulimit -n 32 && "$@")`
`1254`	`1254`	`}`
`1255`	`1255`
`1256`		`-test_lazy_prereq ULIMIT_FILE_DESCRIPTORS 'run_with_limited_open_files true'`
	`1256`	`+test_lazy_prereq ULIMIT_FILE_DESCRIPTORS '`
	`1257`	`+ test_have_prereq !MINGW,!CYGWIN &&`
	`1258`	`+ run_with_limited_open_files true`
	`1259`	`+'`
`1257`	`1260`
`1258`	`1261`	`test_expect_success ULIMIT_FILE_DESCRIPTORS 'large transaction creating branches does not burst open file limit' '`
`1259`	`1262`	`(`
Original file line number	Diff line number	Diff line change
`@@ -279,7 +279,6 @@ test_expect_success 'describe ignoring a borken submodule' '`
`279`	`279`	`grep broken out`
`280`	`280`	`'`
`281`	`281`
`282`		`-# we require ulimit, this excludes Windows`
`283`	`282`	`test_expect_failure ULIMIT_STACK_SIZE 'name-rev works in a deep repo' '`
`284`	`283`	`i=1 &&`
`285`	`284`	`while test $i -lt 8000`
Original file line number	Diff line number	Diff line change
`@@ -1863,7 +1863,6 @@ test_expect_success 'version sort with very long prerelease suffix' '`
`1863`	`1863`	`git tag -l --sort=version:refname`
`1864`	`1864`	`'`
`1865`	`1865`
`1866`		`-# we require ulimit, this excludes Windows`
`1867`	`1866`	`test_expect_success ULIMIT_STACK_SIZE '--contains and --no-contains work in a deep repo' '`
`1868`	`1867`	`>expect &&`
`1869`	`1868`	`i=1 &&`