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

[Vikram Adve]

Changes in directory llvm/test/Programs:

Makefile.programs updated: 1.80 -> 1.81

---
Log message:

Use a common (and higher) time limit for all architectures.
Individual makefiles were overriding this incorrectly otherwise
(i.e,. decreasing it instead of increasing it).
This only matters on hanging failures anyway.


---
Diffs of the changes:

Index: llvm/test/Programs/Makefile.programs
diff -u llvm/test/Programs/Makefile.programs:1.80 llvm/test/Programs/Makefile.programs:1.81
--- llvm/test/Programs/Makefile.programs:1.80	Wed Jul 30 12:57:14 2003
+++ llvm/test/Programs/Makefile.programs	Wed Aug  6 15:40:41 2003
@@ -65,11 +65,7 @@
 # timeout.  This is overridable on the commandline or in tests makefiles.
 #
 ifndef RUNTIMELIMIT
-  ifeq ($(ARCH),Sparc)
-    RUNTIMELIMIT := 500
-  else
-    RUNTIMELIMIT := 40
-  endif
+  RUNTIMELIMIT := 500
 endif
 
 # RUNSAFELY - This program simply runs another program.  If the program works
@@ -232,6 +228,10 @@
 	$(LGCCLD) $(STATS) $< -lgcc -lc $(LIBS) crtend.o -o Output/$*.llvm
 ifneq ($(OPTPASSES),)
 	$(LOPT) -q $(OPTPASSES) < $@ > $@.tmp
+ifneq ($(TRACE)$(TRACEM),)
+	$(LLINK) -f $@.tmp $(LEVEL)/test/Libraries/Output/libinstr.bc > $@.tmp2
+	$(MV) -f $@.tmp2 $@.tmp
+endif
 	$(MV) -f $@.tmp $@
 endif