[llvm-commits] CVS: llvm/test/Programs/Makefile.programs RunSafely.sh

[Chris Lattner]

Changes in directory llvm/test/Programs:

Makefile.programs updated: 1.50 -> 1.51
RunSafely.sh updated: 1.3 -> 1.4

---
Log message:

Changes to make things work better for the SPEC tests


---
Diffs of the changes:

Index: llvm/test/Programs/Makefile.programs
diff -u llvm/test/Programs/Makefile.programs:1.50 llvm/test/Programs/Makefile.programs:1.51
--- llvm/test/Programs/Makefile.programs:1.50	Wed May 14 14:00:19 2003
+++ llvm/test/Programs/Makefile.programs	Sat May 17 17:32:40 2003
@@ -69,8 +69,7 @@
 # correctly, this script has no effect, otherwise it will do things like print a
 # stack trace of a core dump.  It always returns "successful" so that tests will
 # continue to be run.
-ULIMIT   := ulimit -t $(RUNTIMELIMIT)
-RUNSAFELY := $(ULIMIT); $(PROGDIR)/RunSafely.sh
+RUNSAFELY := $(PROGDIR)/RunSafely.sh $(RUNTIMELIMIT)
 
 #
 # Targets to build for the default target...
@@ -218,13 +217,6 @@
 BUGPOINT_OPTIONS += -input $(INPUT_FILENAME)
 endif
 
-# Rules to build the test output...
-ifndef USE_PRECOMPILED_BYTECODE
-$(PROGRAMS_TO_TEST:%=Output/%.out-nat): \
-Output/%.out-nat: Output/%.native
-	-$(RUNSAFELY) $@ $< $(RUN_OPTIONS)
-endif
-
 # EXTRA_LLI_OPTS is used by the nightly tester to add arguments to invocations
 # of the JIT and LLI in order to get timing info and statistics.
 EXTRA_LLI_OPTS := 
@@ -232,6 +224,14 @@
 LLI_OPTS = -q -abort-on-exception -force-interpreter=true $(EXTRA_LLI_OPTS)
 JIT_OPTS = -force-interpreter=false $(EXTRA_LLI_OPTS)
 
+ifndef PROGRAMS_HAVE_CUSTOM_RUN_RULES
+# Rules to build the test output...
+ifndef USE_PRECOMPILED_BYTECODE
+$(PROGRAMS_TO_TEST:%=Output/%.out-nat): \
+Output/%.out-nat: Output/%.native
+	-$(RUNSAFELY) $@ $< $(RUN_OPTIONS)
+endif
+
 $(PROGRAMS_TO_TEST:%=Output/%.out-lli): \
 Output/%.out-lli: Output/%.llvm.bc $(LLI)
 	-$(RUNSAFELY) $@ $(LLI) $(LLI_OPTS) $< $(RUN_OPTIONS)
@@ -247,6 +247,7 @@
 $(PROGRAMS_TO_TEST:%=Output/%.out-cbe): \
 Output/%.out-cbe: Output/%.cbe
 	-$(RUNSAFELY) $@ $< $(RUN_OPTIONS)
+endif
 
 #
 # Rules to diff test output...


Index: llvm/test/Programs/RunSafely.sh
diff -u llvm/test/Programs/RunSafely.sh:1.3 llvm/test/Programs/RunSafely.sh:1.4
--- llvm/test/Programs/RunSafely.sh:1.3	Sun May 11 13:55:29 2003
+++ llvm/test/Programs/RunSafely.sh	Sat May 17 17:32:40 2003
@@ -11,13 +11,16 @@
 #           first argument specified, and outputs a <outputfile>.time file which
 #           contains a timing of the program.
 #
-# Syntax:  ./RunSafely.sh <outputfile> <program> <arguments>
+# Syntax:  ./RunSafely.sh <ulimit> <outputfile> <program> <arguments>
 #
+ULIMIT=$1
+shift
 OUTFILE=$1
 shift
 PROGRAM=$1
 shift
 
+ulimit -t $ULIMIT
 rm -f core core.*
 ulimit -c unlimited
 (time -p $PROGRAM $* > $OUTFILE) 2> $OUTFILE.time