aboutsummaryrefslogtreecommitdiff
path: root/Makefile.programs
diff options
context:
space:
mode:
authorDaniel Dunbar <daniel@zuster.org>2010-06-15 20:01:10 +0000
committerDaniel Dunbar <daniel@zuster.org>2010-06-15 20:01:10 +0000
commit11a925ca610430084832546cca9b15c0c31a51f0 (patch)
tree5aaf1a6c86d2a593f14f30be8b8899eaa69f0b7f /Makefile.programs
parent64664f9e547d55a613d705c2f513e58a9aaeb618 (diff)
Run DiffOutput/fpcmp under RunToolSafely, to allow testing old revisions which
unfortunately hit the fpcmp infinite loop when testing with Clang. git-svn-id: https://llvm.org/svn/llvm-project/test-suite/trunk@106035 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'Makefile.programs')
-rw-r--r--Makefile.programs7
1 files changed, 6 insertions, 1 deletions
diff --git a/Makefile.programs b/Makefile.programs
index a03eb30e..583753a0 100644
--- a/Makefile.programs
+++ b/Makefile.programs
@@ -64,7 +64,12 @@ TOLERANCEOPT += -a $(FP_ABSTOLERANCE)
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.