aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpboutill2012-09-04 17:45:50 +0000
committerpboutill2012-09-04 17:45:50 +0000
commitfaff084e23b1b1fdfded3c24508b4b6c14d4ca8c (patch)
treea90e5046a6cb5baf20bd3933df92017c75aa0ddd
parent6c3451cf2aef8b5dc9ee7833b050816f76bec10d (diff)
test-suite: fix grep rule for output tests
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@15770 85f007b7-540e-0410-9357-904b9bb8a0f7
-rw-r--r--test-suite/Makefile4
1 files changed, 3 insertions, 1 deletions
diff --git a/test-suite/Makefile b/test-suite/Makefile
index 0b75a01bb3..beea5d94a6 100644
--- a/test-suite/Makefile
+++ b/test-suite/Makefile
@@ -41,6 +41,7 @@ SHOW := $(if $(VERBOSE),@true,@echo)
HIDE := $(if $(VERBOSE),,@)
REDIR := $(if $(VERBOSE),,> /dev/null 2>&1)
+bogomips:=
ifneq (,$(wildcard /proc/cpuinfo))
sedbogo := -e "s/bogomips.*: \([0-9]*\).*/\1/p" # i386, ppc
sedbogo += -e "s/Cpu0Bogo.*: \([0-9]*\).*/\1/p" # sparc
@@ -265,8 +266,9 @@ $(addsuffix .log,$(wildcard output/*.v)): %.v.log: %.v
tmpoutput=`mktemp /tmp/coqcheck.XXXXXX`; \
$(command) "$<" 2>&1 \
| grep -v "Welcome to Coq" \
- | grep -v "[Loading ML file" \
+ | grep -v "\[Loading ML file" \
| grep -v "Skipping rcfile loading" \
+ | tail -n +2 \
> $$tmpoutput; \
diff -u $*.out $$tmpoutput 2>&1; R=$$?; times; \
if [ $$R = 0 ]; then \