diff options
-rwxr-xr-x | t/t1400-update-ref.sh | 5 | ||||
-rwxr-xr-x | t/t6120-describe.sh | 1 | ||||
-rwxr-xr-x | t/t7004-tag.sh | 1 | ||||
-rw-r--r-- | t/test-lib.sh | 10 |
4 files changed, 12 insertions, 5 deletions
diff --git a/t/t1400-update-ref.sh b/t/t1400-update-ref.sh index dc98b4bc6d..664a3a4e4e 100755 --- 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 index dd6dd9df9b..3d45dc2955 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 diff --git a/t/t7004-tag.sh b/t/t7004-tag.sh index 5bf5ace56b..b545c33f83 100755 --- 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 index f22c1b260a..8a91fb10a9 100644 --- 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 | |