diff options
Diffstat (limited to 'llvm/utils/lit')
| -rw-r--r-- | llvm/utils/lit/lit/run.py | 8 | ||||
| -rw-r--r-- | llvm/utils/lit/tests/shtest-ulimit.py | 10 |
2 files changed, 13 insertions, 5 deletions
diff --git a/llvm/utils/lit/lit/run.py b/llvm/utils/lit/lit/run.py index 62070e8..55de914 100644 --- a/llvm/utils/lit/lit/run.py +++ b/llvm/utils/lit/lit/run.py @@ -137,6 +137,10 @@ class Run(object): "Raised process limit from %d to %d" % (soft_limit, desired_limit) ) except Exception as ex: - # Warn, unless this is Windows or z/OS, in which case this is expected. - if os.name != "nt" and platform.system() != "OS/390": + # Warn, unless this is Windows, z/OS, or Cygwin in which case this is expected. + if ( + os.name != "nt" + and platform.system() != "OS/390" + and platform.sys.platform != "cygwin" + ): self.lit_config.warning("Failed to raise process limit: %s" % ex) diff --git a/llvm/utils/lit/tests/shtest-ulimit.py b/llvm/utils/lit/tests/shtest-ulimit.py index 9a8febd..09cd475 100644 --- a/llvm/utils/lit/tests/shtest-ulimit.py +++ b/llvm/utils/lit/tests/shtest-ulimit.py @@ -3,9 +3,13 @@ # ulimit does not work on non-POSIX platforms. # Solaris for some reason does not respect ulimit -n, so mark it unsupported # as well. -# UNSUPPORTED: system-windows, system-solaris +# UNSUPPORTED: system-windows, system-cygwin, system-solaris -# RUN: not %{lit} -a -v %{inputs}/shtest-ulimit --order=lexical | FileCheck %s +# RUN: %{python} %S/Inputs/shtest-ulimit/print_limits.py | grep RLIMIT_NOFILE \ +# RUN: | sed -n -e 's/.*=//p' | tr -d '\n' > %t.nofile_limit + +# RUN: not %{lit} -a -v %{inputs}/shtest-ulimit --order=lexical \ +# RUN: | FileCheck -DBASE_NOFILE_LIMIT=%{readfile:%t.nofile_limit} %s # CHECK: -- Testing: 3 tests{{.*}} @@ -18,4 +22,4 @@ # CHECK: RLIMIT_NOFILE=50 # CHECK-LABEL: FAIL: shtest-ulimit :: ulimit_reset.txt ({{[^)]*}}) -# CHECK-NOT: RLIMIT_NOFILE=50 +# CHECK: RLIMIT_NOFILE=[[BASE_NOFILE_LIMIT]] |