[llvm-commits] [test-suite] r106035 - /test-suite/trunk/Makefile.programs

[Daniel Dunbar]

Author: ddunbar
Date: Tue Jun 15 15:01:10 2010
New Revision: 106035

URL: http://llvm.org/viewvc/llvm-project?rev=106035&view=rev
Log:
Run DiffOutput/fpcmp under RunToolSafely, to allow testing old revisions which
unfortunately hit the fpcmp infinite loop when testing with Clang.

Modified:
    test-suite/trunk/Makefile.programs

Modified: test-suite/trunk/Makefile.programs
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/Makefile.programs?rev=106035&r1=106034&r2=106035&view=diff
==============================================================================
--- test-suite/trunk/Makefile.programs (original)
+++ test-suite/trunk/Makefile.programs Tue Jun 15 15:01:10 2010
@@ -64,7 +64,12 @@
 endif
 
 # DIFFPROG - The program used to diff the output
-DIFFPROG := $(PROGDIR)/DiffOutput.sh "$(LLVMTOOLCURRENT)/fpcmp $(TOLERANCEOPT)"
+#
+# We run this under RunToolSafely because 'fpcmp' at one point would infinite
+# loop on some inputs, which blocks testing some historical revisions. We can
+# remove this once we build our own test tools.
+DIFFPROG := $(PROGDIR)/RunToolSafely.sh 60 \
+  $(PROGDIR)/DiffOutput.sh "$(LLVMTOOLCURRENT)/fpcmp $(TOLERANCEOPT)"
 
 # RUNTIMELIMIT - The number of seconds we should wait before certain events
 # timeout.  This is overridable on the commandline or in tests makefiles.