Avoid a problem with ulimit on Solaris & friends, patch by Edward O'Callaghan!

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@77767 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/test/Makefile b/test/Makefile
index baae5021a3ac400a2b8456e00313913c8789ef7f..1194cd07d516f02b83bc416ed94dc898c8586d85 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -52,10 +52,16 @@ ifdef IGNORE_TESTS
 RUNTESTFLAGS += --ignore "$(strip $(IGNORE_TESTS))"
 endif
 
+# Both AuroraUX & Solaris do not have the -m flag for ulimit
+ifeq ($(OS),SunOS)
+ULIMIT=ulimit -t 600 ; ulimit -d 512000 ; ulimit -v 512000 ;
+else
+ULIMIT=ulimit -t 600 ; ulimit -d 512000 ; ulimit -m 512000 ; ulimit -v 512000 ;
+endif
+
 ifneq ($(RUNTEST),)
 check-local:: site.exp
-       ( ulimit -t 600 ; ulimit -d 512000 ; \
-         ulimit -m 512000 ; ulimit -v 512000 ; \
+       ( $(ULIMIT) \
          PATH="$(LLVMToolDir):$(LLVM_SRC_ROOT)/test/Scripts:$(PATH)" \
          $(RUNTEST) $(RUNTESTFLAGS) )
 else
@@ -78,8 +84,7 @@ check-one: site.exp $(TCLSH)
          echo "proc verbose args { }" ; \
          echo "source $(LLVM_SRC_ROOT)/test/lib/llvm.exp" ; \
          echo "RunLLVMTests $(TESTPATH)" ) | \
-       ( ulimit -t 600 ; ulimit -d 512000 ; \
-         ulimit -m 512000 ; ulimit -v 512000 ; \
+       ( $(ULIMIT) \
          PATH="$(LLVMToolDir):$(LLVM_SRC_ROOT)/test/Scripts:$(PATH)" \
          $(TCLSH) )
 endif