Commit d2420013 authored by Simon Peyton Jones's avatar Simon Peyton Jones
Browse files

Merge branch 'master' of http://darcs.haskell.org/testsuite

parents cffcc441 fee30b7d
......@@ -86,17 +86,11 @@ else
RUNTEST_OPTS += -e ghc_with_smp=0
endif
LLVM_VERSION = $(shell $(SHELL) -c "llvmc --version | grep version | sed 's/^.*version \([0-9]*\)\.\([0-9]*\).*$$/\1\.\2/'" 2> /dev/null)
ifneq "$(LLVM_VERSION)" ""
ifneq "$(LLVM_VERSION)" "2.7"
ifneq "$(shell $(SHELL) -c 'llvmc --version | grep version' 2> /dev/null)" ""
RUNTEST_OPTS += -e ghc_with_llvm=1
else
RUNTEST_OPTS += -e ghc_with_llvm=0
endif
else
RUNTEST_OPTS += -e ghc_with_llvm=0
endif
ifeq "$(WINDOWS)" "YES"
RUNTEST_OPTS += -e windows=True
......
......@@ -4,11 +4,11 @@ readFail001.hs:25:11:
readFail001.hs:38:32:
Not in scope: type constructor or class `Leaf'
A data constructor of that name is in scope; did you mean -XPolyKinds?
A data constructor of that name is in scope; did you mean -XDataKinds?
readFail001.hs:38:41:
Not in scope: type constructor or class `Leaf'
A data constructor of that name is in scope; did you mean -XPolyKinds?
A data constructor of that name is in scope; did you mean -XDataKinds?
readFail001.hs:87:11: Not in scope: `x'
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment