diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-09-25 06:24:09 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-09-25 06:24:10 (GMT) |
| commit | 9709ffac8004c3dc62dc946af469ec6d69bfeffb (patch) | |
| tree | 6e6fd0696c8cec710f3048b8fc2aa1556a4a44ce /t/test-lib.sh | |
| parent | f759c873a3772675dba050f28c33d585406291c3 (diff) | |
| parent | 7236a34c984de7027efbc8a03403598f01f173a2 (diff) | |
| download | git-9709ffac8004c3dc62dc946af469ec6d69bfeffb.zip git-9709ffac8004c3dc62dc946af469ec6d69bfeffb.tar.gz git-9709ffac8004c3dc62dc946af469ec6d69bfeffb.tar.bz2 | |
Merge branch 'rj/test-ulimit-on-windows'
On Cygwin, "ulimit -s" does not report failure but it does not work
at all, which causes an unexpected success of some tests that
expect failures under a limited stack situation. This has been
fixed.
* rj/test-ulimit-on-windows:
t9010-*.sh: skip all tests if the PIPE prereq is missing
test-lib: use more compact expression in PIPE prerequisite
test-lib: don't use ulimit in test prerequisites on cygwin
Diffstat (limited to 't/test-lib.sh')
| -rw-r--r-- | t/test-lib.sh | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/t/test-lib.sh b/t/test-lib.sh index 83f5d3d..9b61f16 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -1067,14 +1067,8 @@ test_i18ngrep () { test_lazy_prereq PIPE ' # test whether the filesystem supports FIFOs - case $(uname -s) in - CYGWIN*|MINGW*) - false - ;; - *) - rm -f testfifo && mkfifo testfifo - ;; - esac + test_have_prereq !MINGW,!CYGWIN && + rm -f testfifo && mkfifo testfifo ' test_lazy_prereq SYMLINKS ' @@ -1170,13 +1164,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 | |