Commit 8ebdadb0 authored by dterei's avatar dterei
Browse files

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

parents 6e56fa9d 6b4e38ae
......@@ -120,6 +120,9 @@ ifeq "$(AR)" ""
AR = ar
endif
# Be careful when using this. On Windows it ends up looking like
# c:/foo/bar which confuses make, as make thinks that the : is Makefile
# syntax
TOP_ABS := $(abspath $(TOP))
$(eval $(call canonicalise,TOP_ABS))
......@@ -135,15 +138,15 @@ PYTHON = python
# the results, and emits a little .mk file with make bindings for the values.
# This way we cache the results for different values of $(TEST_HC)
$(TOP_ABS)/mk/ghc-config : $(TOP_ABS)/mk/ghc-config.hs
$(TOP)/mk/ghc-config : $(TOP)/mk/ghc-config.hs
"$(TEST_HC)" --make -o $@ $<
empty=
space=$(empty) $(empty)
ghc-config-mk = $(TOP_ABS)/mk/ghcconfig$(subst $(space),_,$(subst /,_,$(subst \,_,$(TEST_HC)))).mk
ghc-config-mk = $(TOP)/mk/ghcconfig$(subst $(space),_,$(subst :,_,$(subst /,_,$(subst \,_,$(TEST_HC))))).mk
$(ghc-config-mk) : $(TOP_ABS)/mk/ghc-config
$(TOP_ABS)/mk/ghc-config "$(TEST_HC)" >"$@" || $(RM) "$@"
$(ghc-config-mk) : $(TOP)/mk/ghc-config
$(TOP)/mk/ghc-config "$(TEST_HC)" >"$@" || $(RM) "$@"
include $(ghc-config-mk)
......
module T5820 where
data Foo = Foo
instance Eq Foo
:l T5820
:i Foo
data T = T
:i Foo
......@@ -108,4 +108,5 @@ test('T5557', normal, ghci_script, ['T5557.script'])
test('T5566', normal, ghci_script, ['T5566.script'])
test('GhciKinds', normal, ghci_script, ['GhciKinds.script'])
test('T5564', normal, ghci_script, ['T5564.script'])
test('Defer02', normal, ghci_script, ['Defer02.script'])
\ No newline at end of file
test('Defer02', normal, ghci_script, ['Defer02.script'])
test('T5820', normal, ghci_script, ['T5820.script'])
T1074.hs:5:1:
Warning: The import of `Control.Monad.Reader' is redundant
except perhaps to import instances from `Control.Monad.Reader'
To import instances alone, use: import Control.Monad.Reader()
T1074.hs:5:1: Warning:
The qualified import of `Control.Monad.Reader' is redundant
except perhaps to import instances from `Control.Monad.Reader'
To import instances alone, use: import Control.Monad.Reader()
T5211.hs:5:1:
Warning: The import of `Foreign.Storable' is redundant
except perhaps to import instances from `Foreign.Storable'
To import instances alone, use: import Foreign.Storable()
T5211.hs:5:1: Warning:
The qualified import of `Foreign.Storable' is redundant
except perhaps to import instances from `Foreign.Storable'
To import instances alone, use: import Foreign.Storable()
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