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

7 files changed, 26 insertions, 14 deletions

diff --git a/testsuite/mk/boilerplate.mk b/testsuite/mk/boilerplate.mk
index dd5be687a0..74f2edcda2 100644
--- a/testsuite/mk/boilerplate.mk
+++ b/testsuite/mk/boilerplate.mk
@@ -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)
 
diff --git a/testsuite/tests/ghci/scripts/T5820.hs b/testsuite/tests/ghci/scripts/T5820.hs
new file mode 100644
index 0000000000..99d36e5fc2
--- /dev/null
+++ b/testsuite/tests/ghci/scripts/T5820.hs
@@ -0,0 +1,3 @@
+module T5820 where
+data Foo = Foo
+instance Eq Foo
diff --git a/testsuite/tests/ghci/scripts/T5820.script b/testsuite/tests/ghci/scripts/T5820.script
new file mode 100644
index 0000000000..e1a0bd10af
--- /dev/null
+++ b/testsuite/tests/ghci/scripts/T5820.script
@@ -0,0 +1,4 @@
+:l T5820
+:i Foo
+data T = T
+:i Foo
diff --git a/testsuite/tests/ghci/scripts/T5820.stdout b/testsuite/tests/ghci/scripts/T5820.stdout
new file mode 100644
index 0000000000..0519ecba6e
--- /dev/null
+++ b/testsuite/tests/ghci/scripts/T5820.stdout
@@ -0,0 +1 @@
+ 
\ No newline at end of file
diff --git a/testsuite/tests/ghci/scripts/all.T b/testsuite/tests/ghci/scripts/all.T
index b559dcf099..dae116e9ad 100755
--- a/testsuite/tests/ghci/scripts/all.T
+++ b/testsuite/tests/ghci/scripts/all.T
@@ -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'])
diff --git a/testsuite/tests/module/T1074.stderr b/testsuite/tests/module/T1074.stderr
index b368ca119e..53b33604b9 100644
--- a/testsuite/tests/module/T1074.stderr
+++ b/testsuite/tests/module/T1074.stderr
@@ -1,5 +1,5 @@
 
-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()
diff --git a/testsuite/tests/rename/should_fail/T5211.stderr b/testsuite/tests/rename/should_fail/T5211.stderr
index a33a02750c..b99cc04d97 100644
--- a/testsuite/tests/rename/should_fail/T5211.stderr
+++ b/testsuite/tests/rename/should_fail/T5211.stderr
@@ -1,5 +1,5 @@
-

-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()