[commit: ghc] wip/tc/typeable-with-kinds: testsuite: fix/update fallout from Typeable changes (bcb49ae)

git at git.haskell.org git at git.haskell.org
Sat Mar 7 16:43:53 UTC 2015 

Repository : ssh://git@git.haskell.org/ghc

On branch  : wip/tc/typeable-with-kinds
Link       : http://ghc.haskell.org/trac/ghc/changeset/bcb49ae326d626e884f83ac4d65b2004a215cca8/ghc

>---------------------------------------------------------------

commit bcb49ae326d626e884f83ac4d65b2004a215cca8
Author: Austin Seipp <austin at well-typed.com>
Date:   Thu Mar 5 20:01:36 2015 -0600

    testsuite: fix/update fallout from Typeable changes
    
    Signed-off-by: Austin Seipp <austin at well-typed.com>


>---------------------------------------------------------------

bcb49ae326d626e884f83ac4d65b2004a215cca8
 testsuite/tests/deriving/should_compile/all.T                |  2 +-
 testsuite/tests/deriving/should_fail/T2604.hs                |  9 ---------
 testsuite/tests/deriving/should_fail/T2604.stderr            | 10 ----------
 testsuite/tests/deriving/should_fail/T5863a.hs               | 12 ------------
 testsuite/tests/deriving/should_fail/T5863a.stderr           | 10 ----------
 testsuite/tests/deriving/should_fail/T7800.hs                |  7 -------
 testsuite/tests/deriving/should_fail/T7800.stderr            |  6 ------
 testsuite/tests/deriving/should_fail/T7800a.hs               |  4 ----
 testsuite/tests/deriving/should_fail/T9687.stderr            |  4 +---
 testsuite/tests/deriving/should_fail/all.T                   |  6 +++---
 testsuite/tests/polykinds/T8132.stderr                       |  4 +---
 .../typecheck/should_fail/TcStaticPointersFail02.stderr      |  2 +-
 12 files changed, 7 insertions(+), 69 deletions(-)

diff --git a/testsuite/tests/deriving/should_compile/all.T b/testsuite/tests/deriving/should_compile/all.T
index 8d90236..b56baed 100644
--- a/testsuite/tests/deriving/should_compile/all.T
+++ b/testsuite/tests/deriving/should_compile/all.T
@@ -46,7 +46,7 @@ test('T8758', extra_clean(['T8758a.o', 'T8758a.hi']), multimod_compile, ['T8758a
 test('T8678', normal, compile, [''])
 test('T8865', normal, compile, [''])
 test('T8893', normal, compile, [''])
-test('T8950', expect_broken(8950), compile, [''])
+test('T8950', normal, compile, [''])
 test('T8963', normal, compile, [''])
 test('T7269', normal, compile, [''])
 test('T9069', normal, compile, [''])
diff --git a/testsuite/tests/deriving/should_fail/T2604.hs b/testsuite/tests/deriving/should_fail/T2604.hs
deleted file mode 100644
index 0f830d9..0000000
--- a/testsuite/tests/deriving/should_fail/T2604.hs
+++ /dev/null
@@ -1,9 +0,0 @@
-{-# LANGUAGE GeneralizedNewtypeDeriving #-}
-
-module Test where
-
-import Data.Typeable
-
-data DList a = DList [a] deriving(Typeable)
-
-newtype NList a = NList [a] deriving(Typeable)
diff --git a/testsuite/tests/deriving/should_fail/T2604.stderr b/testsuite/tests/deriving/should_fail/T2604.stderr
deleted file mode 100644
index 3000b50..0000000
--- a/testsuite/tests/deriving/should_fail/T2604.stderr
+++ /dev/null
@@ -1,10 +0,0 @@
-
-T2604.hs:7:35:
-    Can't make a Typeable instance of ‘DList’
-      You need DeriveDataTypeable to derive Typeable instances
-    In the data declaration for ‘DList’
-
-T2604.hs:9:38:
-    Can't make a Typeable instance of ‘NList’
-      You need DeriveDataTypeable to derive Typeable instances
-    In the newtype declaration for ‘NList’
diff --git a/testsuite/tests/deriving/should_fail/T5863a.hs b/testsuite/tests/deriving/should_fail/T5863a.hs
deleted file mode 100644
index 3506dcc..0000000
--- a/testsuite/tests/deriving/should_fail/T5863a.hs
+++ /dev/null
@@ -1,12 +0,0 @@
-{-# LANGUAGE DeriveDataTypeable, TypeFamilies #-}
-
-import Data.Typeable
-
-class C a where
-    data T a :: * 
-
-instance C Int where
-    data T Int = A1 deriving (Typeable)
-
-instance C Bool where
-    data T Bool = A2 deriving (Typeable)
diff --git a/testsuite/tests/deriving/should_fail/T5863a.stderr b/testsuite/tests/deriving/should_fail/T5863a.stderr
deleted file mode 100644
index d64f1b2..0000000
--- a/testsuite/tests/deriving/should_fail/T5863a.stderr
+++ /dev/null
@@ -1,10 +0,0 @@
-
-T5863a.hs:9:31:
-    Deriving Typeable is not allowed for family instances;
-    derive Typeable for ‘T’ alone
-    In the data instance declaration for ‘T’
-
-T5863a.hs:12:32:
-    Deriving Typeable is not allowed for family instances;
-    derive Typeable for ‘T’ alone
-    In the data instance declaration for ‘T’
diff --git a/testsuite/tests/deriving/should_fail/T7800.hs b/testsuite/tests/deriving/should_fail/T7800.hs
deleted file mode 100644
index 9f190cf..0000000
--- a/testsuite/tests/deriving/should_fail/T7800.hs
+++ /dev/null
@@ -1,7 +0,0 @@
-{-# LANGUAGE StandaloneDeriving, DeriveDataTypeable #-}
-module T7800 where
-
-import T7800a
-import Data.Typeable
-
-deriving instance Typeable A
diff --git a/testsuite/tests/deriving/should_fail/T7800.stderr b/testsuite/tests/deriving/should_fail/T7800.stderr
deleted file mode 100644
index 8cd8533..0000000
--- a/testsuite/tests/deriving/should_fail/T7800.stderr
+++ /dev/null
@@ -1,6 +0,0 @@
-[1 of 2] Compiling T7800a           ( T7800a.hs, T7800a.o )
-[2 of 2] Compiling T7800            ( T7800.hs, T7800.o )
-
-T7800.hs:7:1:
-    To make a Typeable instance of poly-kinded ‘A’, use XPolyKinds
-    In the stand-alone deriving instance for ‘Typeable A’
diff --git a/testsuite/tests/deriving/should_fail/T7800a.hs b/testsuite/tests/deriving/should_fail/T7800a.hs
deleted file mode 100644
index 22f1305..0000000
--- a/testsuite/tests/deriving/should_fail/T7800a.hs
+++ /dev/null
@@ -1,4 +0,0 @@
-{-# LANGUAGE PolyKinds #-}
-module T7800a where
-
-data A a
\ No newline at end of file
diff --git a/testsuite/tests/deriving/should_fail/T9687.stderr b/testsuite/tests/deriving/should_fail/T9687.stderr
index 10619a6..ad95393 100644
--- a/testsuite/tests/deriving/should_fail/T9687.stderr
+++ b/testsuite/tests/deriving/should_fail/T9687.stderr
@@ -1,5 +1,3 @@
 
 T9687.hs:4:10:
-    Typeable instances can only be derived
-      Try ‘deriving instance Typeable (,,,,,,,)’
-      (requires StandaloneDeriving)
+    Class `Typeable` does not support user-specified instances.
diff --git a/testsuite/tests/deriving/should_fail/all.T b/testsuite/tests/deriving/should_fail/all.T
index df7957d..60a4b7b 100644
--- a/testsuite/tests/deriving/should_fail/all.T
+++ b/testsuite/tests/deriving/should_fail/all.T
@@ -17,7 +17,7 @@ test('drvfail016',
      run_command,
      ['$MAKE --no-print-directory -s drvfail016'])
 test('T2394', normal, compile_fail, [''])
-test('T2604', normal, compile_fail, [''])
+# T2604 was removed as it was out of date re: fixing #9858
 test('T2701', normal, compile_fail, [''])
 test('T2851', normal, compile_fail, [''])
 test('T2721', normal, compile_fail, [''])
@@ -38,14 +38,14 @@ test('T1133A',
      extra_clean(['T1133A.o-boot', 'T1133A.hi-boot']),
      run_command,
      ['$MAKE --no-print-directory -s T1133A'])
-test('T5863a', normal, compile_fail, [''])
+# 5863a was removed as it was out of date re: fixing #9858
 test('T7959', normal, compile_fail, [''])
 
 test('T1496', normal, compile_fail, [''])
 test('T4846', normal, compile_fail, [''])
 test('T7148', normal, compile_fail, [''])
 test('T7148a', normal, compile_fail, [''])
-test('T7800', normal, multimod_compile_fail, ['T7800',''])
+# T7800 was removed as it was out of date re: fixing #9858
 test('T5498', normal, compile_fail, [''])
 test('T6147', normal, compile_fail, [''])
 test('T8851', normal, compile_fail, [''])
diff --git a/testsuite/tests/polykinds/T8132.stderr b/testsuite/tests/polykinds/T8132.stderr
index 6c567de..e4c4659 100644
--- a/testsuite/tests/polykinds/T8132.stderr
+++ b/testsuite/tests/polykinds/T8132.stderr
@@ -1,5 +1,3 @@
 
 T8132.hs:6:10:
-    Typeable instances can only be derived
-      Try ‘deriving instance Typeable K’
-      (requires StandaloneDeriving)
+    Class `Typeable` does not support user-specified instances.
diff --git a/testsuite/tests/typecheck/should_fail/TcStaticPointersFail02.stderr b/testsuite/tests/typecheck/should_fail/TcStaticPointersFail02.stderr
index ead183c..3989ea4 100644
--- a/testsuite/tests/typecheck/should_fail/TcStaticPointersFail02.stderr
+++ b/testsuite/tests/typecheck/should_fail/TcStaticPointersFail02.stderr
@@ -7,7 +7,7 @@ TcStaticPointersFail02.hs:9:6:
         f1 = static (undefined :: (forall a. a -> a) -> b)
 
 TcStaticPointersFail02.hs:12:6:
-    No instance for (Data.Typeable.Internal.Typeable Monad)
+    No instance for (Data.Typeable.Internal.Typeable m)
       (maybe you haven't applied a function to enough arguments?)
       arising from a static form
     In the expression: static return

More information about the ghc-commits mailing list