summaryrefslogtreecommitdiff
path: root/testsuite/tests/ghc-regress/deriving
diff options
context:
space:
mode:
Diffstat (limited to 'testsuite/tests/ghc-regress/deriving')
-rw-r--r--testsuite/tests/ghc-regress/deriving/Makefile3
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_compile/Makefile3
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_compile/T2378.hs10
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_compile/T2856.hs28
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_compile/T3012.hs10
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_compile/T3057.hs6
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_compile/T3965.hs23
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_compile/T4220.hs7
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_compile/T4302.hs18
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_compile/T4325.hs7
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_compile/T4325.stderr3
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_compile/T4816.hs10
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_compile/T4966.hs44
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_compile/T4966.stderr3
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_compile/all.T32
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_compile/deriving-1935.hs22
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_compile/drv-foldable-traversable1.hs33
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_compile/drv-foldable-traversable1.stderr3
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_compile/drv-functor1.hs65
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_compile/drv-functor1.stderr3
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_compile/drv-functor2.hs9
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_compile/drv001.hs21
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_compile/drv001.stderr0
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_compile/drv002.hs14
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_compile/drv002.stderr0
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_compile/drv003.hs17
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_compile/drv003.stderr0
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_compile/drv004.hs9
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_compile/drv004.stderr0
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_compile/drv005.hs6
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_compile/drv005.stderr0
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_compile/drv006.hs9
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_compile/drv006.stderr0
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_compile/drv007.hs6
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_compile/drv007.stderr0
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_compile/drv008.hs7
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_compile/drv008.stderr0
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_compile/drv009.hs6
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_compile/drv009.stderr0
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_compile/drv010.hs4
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_compile/drv010.stderr0
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_compile/drv011.hs6
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_compile/drv012.hs10
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_compile/drv013.hs11
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_compile/drv014.hs11
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_compile/drv015.hs14
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_compile/drv020.hs34
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_compile/drv021.hs16
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_fail/Makefile8
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_fail/T2394.hs9
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_fail/T2394.stderr6
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_fail/T2604.hs9
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_fail/T2604.stderr10
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_fail/T2604.stderr-7.011
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_fail/T2701.hs10
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_fail/T2701.stderr5
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_fail/T2721.hs15
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_fail/T2721.stderr6
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_fail/T2851.hs9
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_fail/T2851.stderr9
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_fail/T3101.hs9
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_fail/T3101.stderr6
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_fail/T3621.hs36
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_fail/T3621.stderr13
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_fail/T3833.hs9
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_fail/T3833.stderr6
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_fail/T3834.hs9
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_fail/T3834.stderr6
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_fail/T4528.hs11
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_fail/T4528.stderr14
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_fail/all.T35
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_fail/drvfail-foldable-traversable1.hs21
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_fail/drvfail-foldable-traversable1.stderr38
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_fail/drvfail-functor1.hs6
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_fail/drvfail-functor1.stderr5
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_fail/drvfail-functor2.hs26
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_fail/drvfail-functor2.stderr32
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_fail/drvfail001.hs26
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_fail/drvfail001.stderr9
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_fail/drvfail002.hs20
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_fail/drvfail002.stderr6
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_fail/drvfail002.stderr-hugs1
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_fail/drvfail003.hs16
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_fail/drvfail003.stderr9
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_fail/drvfail003.stderr-hugs1
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_fail/drvfail004.hs9
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_fail/drvfail004.stderr9
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_fail/drvfail004.stderr-hugs4
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_fail/drvfail005.hs4
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_fail/drvfail005.stderr5
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_fail/drvfail006.hs11
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_fail/drvfail006.stderr6
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_fail/drvfail006.stderr-hugs1
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_fail/drvfail007.hs4
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_fail/drvfail007.stderr9
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_fail/drvfail007.stderr-hugs1
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_fail/drvfail008.hs14
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_fail/drvfail008.stderr6
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_fail/drvfail009.hs20
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_fail/drvfail009.stderr23
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_fail/drvfail009.stderr-hugs1
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_fail/drvfail010.hs10
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_fail/drvfail010.stderr11
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_fail/drvfail010.stderr-hugs1
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_fail/drvfail011.hs8
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_fail/drvfail011.stderr10
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_fail/drvfail012.hs8
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_fail/drvfail012.stderr9
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_fail/drvfail013.hs6
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_fail/drvfail013.stderr18
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_fail/drvfail014.hs13
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_fail/drvfail014.stderr9
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_fail/drvfail015.hs13
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_fail/drvfail015.stderr13
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_fail/drvfail015.stderr-7.012
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_fail/drvfail016.hs-boot7
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_fail/drvfail016.stderr4
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_fail/drvfail016.stdout1
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_run/Makefile3
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_run/T2529.hs21
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_run/T2529.stdout2
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_run/T3087.hs33
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_run/T3087.stdout4
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_run/T4136.hs9
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_run/T4136.stdout2
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_run/T4528a.hs7
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_run/T4528a.stdout1
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_run/T5041.hs10
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_run/T5041.stdout1
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_run/all.T34
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_run/drvrun-foldable1.hs15
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_run/drvrun-foldable1.stdout1
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_run/drvrun-functor1.hs49
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_run/drvrun-functor1.stdout8
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_run/drvrun001.hs13
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_run/drvrun001.stdout1
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_run/drvrun002.hs17
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_run/drvrun002.stdout2
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_run/drvrun003.hs30
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_run/drvrun003.stdout3
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_run/drvrun004.hs10
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_run/drvrun004.stdout2
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_run/drvrun005.hs27
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_run/drvrun005.stderr0
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_run/drvrun005.stdout2
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_run/drvrun006.hs49
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_run/drvrun006.stdout6
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_run/drvrun007.hs6
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_run/drvrun007.stdout1
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_run/drvrun008.hs8
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_run/drvrun008.stdout1
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_run/drvrun009.hs20
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_run/drvrun009.stdout2
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_run/drvrun010.hs12
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_run/drvrun010.stdout1
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_run/drvrun011.hs16
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_run/drvrun011.stdout2
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_run/drvrun012.hs11
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_run/drvrun012.stdout1
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_run/drvrun013.hs19
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_run/drvrun013.stdout1
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_run/drvrun014.hs19
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_run/drvrun014.stdout1
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_run/drvrun015.hs8
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_run/drvrun015.stdout1
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_run/drvrun016.hs18
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_run/drvrun016.stdout1
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_run/drvrun017.hs10
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_run/drvrun017.stdout1
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_run/drvrun018.hs9
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_run/drvrun018.stdout2
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_run/drvrun019.hs15
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_run/drvrun019.stdout1
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_run/drvrun020.hs46
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_run/drvrun020.stdout1
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_run/drvrun021.hs20
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_run/drvrun021.stdout5
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_run/drvrun022.hs12
-rw-r--r--testsuite/tests/ghc-regress/deriving/should_run/drvrun022.stdout1
179 files changed, 0 insertions, 1934 deletions
diff --git a/testsuite/tests/ghc-regress/deriving/Makefile b/testsuite/tests/ghc-regress/deriving/Makefile
deleted file mode 100644
index 9101fbd40a..0000000000
--- a/testsuite/tests/ghc-regress/deriving/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/deriving/should_compile/Makefile b/testsuite/tests/ghc-regress/deriving/should_compile/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_compile/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/deriving/should_compile/T2378.hs b/testsuite/tests/ghc-regress/deriving/should_compile/T2378.hs
deleted file mode 100644
index e3118cb863..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_compile/T2378.hs
+++ /dev/null
@@ -1,10 +0,0 @@
-{-# LANGUAGE StandaloneDeriving, DeriveDataTypeable #-}
-module Foo( T ) where
-
--- Trac 2378
-
-import Data.Data
-
-newtype T f = MkT Int
-
-deriving instance Typeable1 T
diff --git a/testsuite/tests/ghc-regress/deriving/should_compile/T2856.hs b/testsuite/tests/ghc-regress/deriving/should_compile/T2856.hs
deleted file mode 100644
index c8f81a00bc..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_compile/T2856.hs
+++ /dev/null
@@ -1,28 +0,0 @@
-{-# LANGUAGE TypeFamilies, GeneralizedNewtypeDeriving, StandaloneDeriving, FlexibleInstances #-}
-
--- Test Trac #2856
-
-module T2856 where
-
-import Data.Ratio
-
-----------------------
-class C a where
- data D a
-
-instance C Bool where
- newtype D Bool = DInt Int deriving (Eq, Show, Num)
-
-instance C a => C [a] where
- newtype D [a] = DList (Ratio a) deriving (Eq, Show, Num)
-
-----------------------
-data family W a
-newtype instance W Bool = WInt Int deriving( Eq, Show )
-newtype instance W [a] = WList (Ratio a) deriving( Eq, Show )
-
-deriving instance Num (W Bool)
-deriving instance (Integral a, Num a) => Num (W [a])
- -- Integral needed because superclass Eq needs it,
- -- because of the stupid context on Ratio
-
diff --git a/testsuite/tests/ghc-regress/deriving/should_compile/T3012.hs b/testsuite/tests/ghc-regress/deriving/should_compile/T3012.hs
deleted file mode 100644
index 44b1d64a9c..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_compile/T3012.hs
+++ /dev/null
@@ -1,10 +0,0 @@
-{-# LANGUAGE GADTs, StandaloneDeriving #-}
-
-module T3012 where
-
-data T a where
- Foo :: T Int
- Bar :: T Bool
-
-deriving instance Show (T a)
-
diff --git a/testsuite/tests/ghc-regress/deriving/should_compile/T3057.hs b/testsuite/tests/ghc-regress/deriving/should_compile/T3057.hs
deleted file mode 100644
index 0e9aef7814..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_compile/T3057.hs
+++ /dev/null
@@ -1,6 +0,0 @@
-{-# LANGUAGE StandaloneDeriving, DeriveFunctor #-}
-module T3057 where
-
-deriving instance Functor (Either a)
-
-
diff --git a/testsuite/tests/ghc-regress/deriving/should_compile/T3965.hs b/testsuite/tests/ghc-regress/deriving/should_compile/T3965.hs
deleted file mode 100644
index 2ccaaadfdf..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_compile/T3965.hs
+++ /dev/null
@@ -1,23 +0,0 @@
-{-# LANGUAGE DeriveDataTypeable, FlexibleContexts, StandaloneDeriving, TypeOperators, UndecidableInstances #-}
-module T3965 where
-
-import Data.Data
-
-data T f e = Inl (f e) deriving (Data, Eq)
-
-instance (Typeable1 f) => Typeable1 (T f) where
- typeOf1 _ = error "urk"
-
-newtype Expr f = In (f (Expr f))
-instance Typeable1 f => Typeable (Expr f) where
- typeOf _ = error "urk"
-
-deriving instance (Typeable1 a, Data (a (Expr a))) => Data (Expr a)
-
-data Var e = Var String deriving (Data, Eq, Typeable)
-
-data Domain e g = Domain
- (Expr (T Var))
- deriving (Data, Typeable)
-
-
diff --git a/testsuite/tests/ghc-regress/deriving/should_compile/T4220.hs b/testsuite/tests/ghc-regress/deriving/should_compile/T4220.hs
deleted file mode 100644
index 0b2ba28caa..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_compile/T4220.hs
+++ /dev/null
@@ -1,7 +0,0 @@
-{-# LANGUAGE EmptyDataDecls, DeriveFunctor, DeriveFoldable, DeriveTraversable #-}
-module T4220 where
-
-import Data.Foldable
-import Data.Traversable
-
-data Void a deriving (Functor, Foldable, Traversable)
diff --git a/testsuite/tests/ghc-regress/deriving/should_compile/T4302.hs b/testsuite/tests/ghc-regress/deriving/should_compile/T4302.hs
deleted file mode 100644
index 50369632f9..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_compile/T4302.hs
+++ /dev/null
@@ -1,18 +0,0 @@
-{-# LANGUAGE StandaloneDeriving, DeriveDataTypeable, DeriveFunctor, DeriveFoldable, DeriveTraversable, EmptyDataDecls #-}
-module T4302 where
-
-import Data.Ix
-import Data.Typeable
-import Data.Data
-import Data.Foldable
-import Data.Traversable
-
-data Test a
-
-deriving instance Eq (Test a)
-deriving instance Ord (Test a)
-deriving instance Typeable1 Test
-deriving instance Data a => Data (Test a)
-deriving instance Functor Test
-deriving instance Foldable Test
-deriving instance Traversable Test
diff --git a/testsuite/tests/ghc-regress/deriving/should_compile/T4325.hs b/testsuite/tests/ghc-regress/deriving/should_compile/T4325.hs
deleted file mode 100644
index 68ab81744b..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_compile/T4325.hs
+++ /dev/null
@@ -1,7 +0,0 @@
-{-# LANGUAGE DatatypeContexts #-}
-
-module T4325 where
-
-data Ord a => Heap a b = Empty | Node a b [Heap a b]
- deriving Eq
-
diff --git a/testsuite/tests/ghc-regress/deriving/should_compile/T4325.stderr b/testsuite/tests/ghc-regress/deriving/should_compile/T4325.stderr
deleted file mode 100644
index 90ef1de92d..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_compile/T4325.stderr
+++ /dev/null
@@ -1,3 +0,0 @@
-
-T4325.hs:1:14:
- Warning: -XDatatypeContexts is deprecated: It was widely considered a misfeature, and has been removed from the Haskell language.
diff --git a/testsuite/tests/ghc-regress/deriving/should_compile/T4816.hs b/testsuite/tests/ghc-regress/deriving/should_compile/T4816.hs
deleted file mode 100644
index 0e81e39521..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_compile/T4816.hs
+++ /dev/null
@@ -1,10 +0,0 @@
-{-# LANGUAGE DeriveFunctor #-}
-
-module T4816 where
-
-data Silly a = Sillly a
-
-data Baz o = Baz {
- foo :: o,
- bar :: Silly ()
- } deriving (Functor)
diff --git a/testsuite/tests/ghc-regress/deriving/should_compile/T4966.hs b/testsuite/tests/ghc-regress/deriving/should_compile/T4966.hs
deleted file mode 100644
index d7328c6ef6..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_compile/T4966.hs
+++ /dev/null
@@ -1,44 +0,0 @@
-{-# LANGUAGE DatatypeContexts #-}
-{-# LANGUAGE EmptyDataDecls #-}
-{-# LANGUAGE FlexibleInstances #-}
-{-# LANGUAGE UndecidableInstances #-}
-{-# LANGUAGE OverlappingInstances #-}
-
-module HTk.Toolkit.TreeList (getObjectFromTreeList) where
-
-class Eq c => CItem c
-
--- A bizarre instance decl!
--- People who use instance decls like this are asking for trouble
-instance GUIObject w => Eq w where
- w1 == w2 = toGUIObject w1 == toGUIObject w2
-
-data StateEntry a
- = StateEntry (TreeListObject a) a -- Comment this 'a' out and it type checks
- deriving Eq
-
--- The delicate point about this test is that we want to
--- infer a derived instance decl like this:
--- instance (CItem a, Eq a) => Eq (StateEntry a)
--- But note the instance decl for (Eq w) for any w!
--- There's a danger than we'll use that instance decl
--- to get the derived instance
--- instance (CItem a, GUIObject a) => Eq (StateEntry a)
--- And then that doesn't work subsequently
-
-getObjectFromTreeList :: CItem a => StateEntry a -> Bool
-getObjectFromTreeList state = state == state
-
-data CItem a => TreeListObject a
-
-instance CItem a => Eq (TreeListObject a)
-
-class GUIObject w where
- toGUIObject :: w -> GUIOBJECT
-
-
-data GUIOBJECT
-
-instance Eq GUIOBJECT where
- (==) = undefined
- (/=) = undefined
diff --git a/testsuite/tests/ghc-regress/deriving/should_compile/T4966.stderr b/testsuite/tests/ghc-regress/deriving/should_compile/T4966.stderr
deleted file mode 100644
index b8059925bb..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_compile/T4966.stderr
+++ /dev/null
@@ -1,3 +0,0 @@
-
-T4966.hs:1:14:
- Warning: -XDatatypeContexts is deprecated: It was widely considered a misfeature, and has been removed from the Haskell language.
diff --git a/testsuite/tests/ghc-regress/deriving/should_compile/all.T b/testsuite/tests/ghc-regress/deriving/should_compile/all.T
deleted file mode 100644
index 22353ab2ea..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_compile/all.T
+++ /dev/null
@@ -1,32 +0,0 @@
-test('drv001', normal, compile, [''])
-test('drv002', normal, compile, [''])
-test('drv003', normal, compile, [''])
-test('drv004', normal, compile, [''])
-test('drv005', normal, compile, [''])
-test('drv006', normal, compile, [''])
-test('drv007', normal, compile, [''])
-test('drv008', normal, compile, [''])
-test('drv009', normal, compile, [''])
-test('drv010', normal, compile, [''])
-test('drv011', normal, compile, [''])
-test('drv012', normal, compile, [''])
-test('drv013', normal, compile, [''])
-test('drv014', normal, compile, [''])
-test('drv015', normal, compile, [''])
-test('drv020', normal, compile, [''])
-test('drv021', normal, compile, [''])
-test('deriving-1935', normal, compile, [''])
-test('T2378', normal, compile, [''])
-test('T2856', normal, compile, [''])
-test('T3057', normal, compile, [''])
-test('T3012', normal, compile, [''])
-test('T3965', normal, compile, [''])
-test('T4220', normal, compile, [''])
-test('T4302', normal, compile, [''])
-test('T4325', normal, compile, [''])
-test('T4816', normal, compile, [''])
-test('T4966', normal, compile, [''])
-
-test('drv-functor1', normal, compile, [''])
-test('drv-functor2', normal, compile, [''])
-test('drv-foldable-traversable1', normal, compile, [''])
diff --git a/testsuite/tests/ghc-regress/deriving/should_compile/deriving-1935.hs b/testsuite/tests/ghc-regress/deriving/should_compile/deriving-1935.hs
deleted file mode 100644
index 5b3bca0c77..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_compile/deriving-1935.hs
+++ /dev/null
@@ -1,22 +0,0 @@
-{-# OPTIONS_GHC -XDeriveDataTypeable #-}
-
--- Trac #1935
--- See Note [Superclasses of derived instance] in TcDeriv
-
-module Foo where
-
- import Data.Data
-
- data Foo a = Foo
- deriving (Data, Typeable)
-
- data T a = MkT (S a) deriving( Ord )
-
- instance Num a => Eq (T a)
-
- data S a = S
- instance Eq (S a)
- instance Ord (S a)
-
-
- \ No newline at end of file
diff --git a/testsuite/tests/ghc-regress/deriving/should_compile/drv-foldable-traversable1.hs b/testsuite/tests/ghc-regress/deriving/should_compile/drv-foldable-traversable1.hs
deleted file mode 100644
index 712f14a3b5..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_compile/drv-foldable-traversable1.hs
+++ /dev/null
@@ -1,33 +0,0 @@
-{-# LANGUAGE DeriveFunctor, DeriveFoldable, DeriveTraversable #-}
-{-# LANGUAGE RankNTypes #-}
-{-# LANGUAGE FlexibleContexts, DatatypeContexts #-}
-
-module ShouldCompile where
-
-import Data.Foldable
-import Data.Traversable
-
-data Trivial a = Trivial
- deriving (Functor,Foldable,Traversable)
-
--- lots of different things
-data Strange a b c
- = T1 a b c
- | T2 c c c
- | T3 [a] [b] [c] -- lists
- | T4 [[a]] [[b]] [[c]] -- nested lists
- | T5 (c,(b,b),(c,c)) -- tuples
- | T6 ([c],Strange a b c) -- tycons
- deriving (Functor,Foldable,Traversable)
-
-data NotPrimitivelyRecursive a
- = S1 (NotPrimitivelyRecursive (a,a))
- | S2 a
- deriving (Functor,Foldable,Traversable)
-
-data Eq a => StupidConstraint a b = Stupid a b
- deriving (Functor,Foldable,Traversable)
-
--- requires Foldable/Traversable constraint on f and g
-data Compose f g a = Compose (f (g a))
- deriving (Functor,Foldable,Traversable)
diff --git a/testsuite/tests/ghc-regress/deriving/should_compile/drv-foldable-traversable1.stderr b/testsuite/tests/ghc-regress/deriving/should_compile/drv-foldable-traversable1.stderr
deleted file mode 100644
index ceae10cabd..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_compile/drv-foldable-traversable1.stderr
+++ /dev/null
@@ -1,3 +0,0 @@
-
-drv-foldable-traversable1.hs:3:32:
- Warning: -XDatatypeContexts is deprecated: It was widely considered a misfeature, and has been removed from the Haskell language.
diff --git a/testsuite/tests/ghc-regress/deriving/should_compile/drv-functor1.hs b/testsuite/tests/ghc-regress/deriving/should_compile/drv-functor1.hs
deleted file mode 100644
index 8249858cae..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_compile/drv-functor1.hs
+++ /dev/null
@@ -1,65 +0,0 @@
-{-# LANGUAGE DeriveFunctor #-}
-{-# LANGUAGE ExistentialQuantification #-}
-{-# LANGUAGE RankNTypes #-}
-{-# LANGUAGE FlexibleContexts #-}
-{-# LANGUAGE DatatypeContexts #-}
-
-module ShouldCompile where
-
-data Trivial a = Trivial
- deriving (Functor)
-
-data Fun a = Fun (Int -> a)
- deriving (Functor)
-
--- lots of different things
-data Strange a b c
- = T1 a b c
- | T2 [a] [b] [c] -- lists
- | T3 [[a]] [[b]] [[c]] -- nested lists
- | T4 (c,(b,b),(c,c)) -- tuples
- | T5 ([c],Strange a b c) -- tycons
- | T6 (Int -> c) -- function types
- | T7 (a -> (c,a)) -- functions and tuples
- | T8 ((c -> a) -> a) -- continuation
- deriving (Functor)
-
-data NotPrimitivelyRecursive a
- = S1 (NotPrimitivelyRecursive (a,a))
- | S2 a
- deriving (Functor,Eq)
-
-data Eq a => StupidConstraint a b = Stupid a b
- deriving (Functor)
-
--- requires Functor constraint on f and g
-data Compose f g a = Compose (f (g a))
- deriving (Functor)
-
--- We can't derive Functor for the following type.
--- it needs both (Functor (f Int)) and (Functor (f Bool))
--- i.e.:
--- instance (Functor (f Bool), Functor (f Int)) => Functor (ComplexConstraint f)
--- This requires FlexibleContexts and UndecidableInstances
-data ComplexConstraint f a = ComplexContraint (f Int (f Bool a,a))
--- deriving (Functor)
-
-data Universal a
- = Universal (forall b. (b,[a]))
- | Universal2 (forall f. Functor f => (f a))
- | Universal3 (forall a. a -> Int) -- reuse a
- | NotReallyUniversal (forall b. a)
- deriving (Functor)
-
--- Ghc doesn't allow deriving for non-Haskell98 data constructors
-data Existential b
- = forall a. ExistentialList [a]
- | forall f. Functor f => ExistentialFunctor (f b)
- | forall b. SneakyUseSameName (b -> Bool)
- -- deriving (Functor)
-
--- Don't get confused by synonyms
-type IntFun a = Int -> a
-data IntFunD a = IntFunD (IntFun a)
- deriving (Functor)
-
diff --git a/testsuite/tests/ghc-regress/deriving/should_compile/drv-functor1.stderr b/testsuite/tests/ghc-regress/deriving/should_compile/drv-functor1.stderr
deleted file mode 100644
index a531dc56ef..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_compile/drv-functor1.stderr
+++ /dev/null
@@ -1,3 +0,0 @@
-
-drv-functor1.hs:5:14:
- Warning: -XDatatypeContexts is deprecated: It was widely considered a misfeature, and has been removed from the Haskell language.
diff --git a/testsuite/tests/ghc-regress/deriving/should_compile/drv-functor2.hs b/testsuite/tests/ghc-regress/deriving/should_compile/drv-functor2.hs
deleted file mode 100644
index d070feb06d..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_compile/drv-functor2.hs
+++ /dev/null
@@ -1,9 +0,0 @@
-{-# LANGUAGE GeneralizedNewtypeDeriving #-}
-
-module ShouldCompile where
-
--- Deriving Functor should still work with GeneralizedNewtypeDeriving instead of DeriveFunctor
-
-newtype List a = List [a]
- deriving (Functor)
-
diff --git a/testsuite/tests/ghc-regress/deriving/should_compile/drv001.hs b/testsuite/tests/ghc-regress/deriving/should_compile/drv001.hs
deleted file mode 100644
index 694af6a50f..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_compile/drv001.hs
+++ /dev/null
@@ -1,21 +0,0 @@
--- !!! canonical weird example for "deriving"
-module ShouldSucceed where
-
-data X a b
- = C1 (T a)
- | C2 (Y b)
- | C3 (X b a)
- deriving (Read, Show)
-
-data Y b
- = D1
- | D2 (X Int b)
- deriving (Read, Show)
-
-data T a
- = E1
-
-instance Eq a => Show (T a) where
- showsPrec = error "show"
-instance Eq a => Read (T a) where
- readsPrec = error "read"
diff --git a/testsuite/tests/ghc-regress/deriving/should_compile/drv001.stderr b/testsuite/tests/ghc-regress/deriving/should_compile/drv001.stderr
deleted file mode 100644
index e69de29bb2..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_compile/drv001.stderr
+++ /dev/null
diff --git a/testsuite/tests/ghc-regress/deriving/should_compile/drv002.hs b/testsuite/tests/ghc-regress/deriving/should_compile/drv002.hs
deleted file mode 100644
index 15eb2d9ecc..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_compile/drv002.hs
+++ /dev/null
@@ -1,14 +0,0 @@
-module ShouldSucceed where
-
-data Z a b
- = C1 (T a)
- | C2 (Z [a] [b])
- deriving (Show, Read)
-
-data T a
- = E1
-
-instance Eq a => Show (T a) where
- showsPrec = error "show"
-instance Eq a => Read (T a) where
- readsPrec = error "read"
diff --git a/testsuite/tests/ghc-regress/deriving/should_compile/drv002.stderr b/testsuite/tests/ghc-regress/deriving/should_compile/drv002.stderr
deleted file mode 100644
index e69de29bb2..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_compile/drv002.stderr
+++ /dev/null
diff --git a/testsuite/tests/ghc-regress/deriving/should_compile/drv003.hs b/testsuite/tests/ghc-regress/deriving/should_compile/drv003.hs
deleted file mode 100644
index 0b8149ce8a..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_compile/drv003.hs
+++ /dev/null
@@ -1,17 +0,0 @@
--- !!! This is the example given in TcDeriv
---
-module ShouldSucceed where
-
-data T a b
- = C1 (Foo a) (Bar b)
- | C2 Int (T b a)
- | C3 (T a a)
- deriving Eq
-
-data Foo a = MkFoo Double a deriving ()
-instance (Eq a) => Eq (Foo a)
-
-data Bar a = MkBar Int Int deriving ()
-instance (Ping b) => Eq (Bar b)
-
-class Ping a
diff --git a/testsuite/tests/ghc-regress/deriving/should_compile/drv003.stderr b/testsuite/tests/ghc-regress/deriving/should_compile/drv003.stderr
deleted file mode 100644
index e69de29bb2..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_compile/drv003.stderr
+++ /dev/null
diff --git a/testsuite/tests/ghc-regress/deriving/should_compile/drv004.hs b/testsuite/tests/ghc-regress/deriving/should_compile/drv004.hs
deleted file mode 100644
index 324a7f81d4..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_compile/drv004.hs
+++ /dev/null
@@ -1,9 +0,0 @@
--- !!! simple example of deriving Ord and Eq simultaneously
---
-module ShouldSucceed where
-
-data Foo a b c
- = C1 a Int
- | C2 b Double
- | C3 c String
- deriving (Eq, Ord)
diff --git a/testsuite/tests/ghc-regress/deriving/should_compile/drv004.stderr b/testsuite/tests/ghc-regress/deriving/should_compile/drv004.stderr
deleted file mode 100644
index e69de29bb2..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_compile/drv004.stderr
+++ /dev/null
diff --git a/testsuite/tests/ghc-regress/deriving/should_compile/drv005.hs b/testsuite/tests/ghc-regress/deriving/should_compile/drv005.hs
deleted file mode 100644
index 527dde98b9..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_compile/drv005.hs
+++ /dev/null
@@ -1,6 +0,0 @@
--- !!! simple example of deriving Enum
---
-module ShouldSucceed where
-
-data Foo = Foo1 | Foo2 | Foo3 | Foo4 | Foo5 | Foo6 | Foo7 | Foo8
- deriving Enum
diff --git a/testsuite/tests/ghc-regress/deriving/should_compile/drv005.stderr b/testsuite/tests/ghc-regress/deriving/should_compile/drv005.stderr
deleted file mode 100644
index e69de29bb2..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_compile/drv005.stderr
+++ /dev/null
diff --git a/testsuite/tests/ghc-regress/deriving/should_compile/drv006.hs b/testsuite/tests/ghc-regress/deriving/should_compile/drv006.hs
deleted file mode 100644
index 62f2cbcf67..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_compile/drv006.hs
+++ /dev/null
@@ -1,9 +0,0 @@
--- !!! simple examples of deriving Ix
---
-module ShouldSucceed where
-import Data.Ix
-
-data Foo = Foo1 | Foo2 | Foo3 | Foo4 | Foo5 | Foo6 | Foo7 | Foo8
- deriving (Eq, Ord, Ix, Show)
-
-data Bar a b = MkBar a Int b Integer a
diff --git a/testsuite/tests/ghc-regress/deriving/should_compile/drv006.stderr b/testsuite/tests/ghc-regress/deriving/should_compile/drv006.stderr
deleted file mode 100644
index e69de29bb2..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_compile/drv006.stderr
+++ /dev/null
diff --git a/testsuite/tests/ghc-regress/deriving/should_compile/drv007.hs b/testsuite/tests/ghc-regress/deriving/should_compile/drv007.hs
deleted file mode 100644
index 22da5b4aa3..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_compile/drv007.hs
+++ /dev/null
@@ -1,6 +0,0 @@
--- !!! deriving Ord on d. type with a single nullary constructor.
--- (from ghc-2.10 panic - as reported by Sergey Mechveliani <mechvel@botik.ru>)
---
-module ShouldSucceed where
-
-data D = D deriving (Eq,Ord)
diff --git a/testsuite/tests/ghc-regress/deriving/should_compile/drv007.stderr b/testsuite/tests/ghc-regress/deriving/should_compile/drv007.stderr
deleted file mode 100644
index e69de29bb2..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_compile/drv007.stderr
+++ /dev/null
diff --git a/testsuite/tests/ghc-regress/deriving/should_compile/drv008.hs b/testsuite/tests/ghc-regress/deriving/should_compile/drv008.hs
deleted file mode 100644
index b615809caa..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_compile/drv008.hs
+++ /dev/null
@@ -1,7 +0,0 @@
--- !!! deriving Ix on d. type with nullary constructors
-module ShouldSucceed where
-
-import Data.Ix
-
-data AD = A | B | C | D deriving (Show, Ord, Eq, Ix)
-
diff --git a/testsuite/tests/ghc-regress/deriving/should_compile/drv008.stderr b/testsuite/tests/ghc-regress/deriving/should_compile/drv008.stderr
deleted file mode 100644
index e69de29bb2..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_compile/drv008.stderr
+++ /dev/null
diff --git a/testsuite/tests/ghc-regress/deriving/should_compile/drv009.hs b/testsuite/tests/ghc-regress/deriving/should_compile/drv009.hs
deleted file mode 100644
index 4ac069d30c..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_compile/drv009.hs
+++ /dev/null
@@ -1,6 +0,0 @@
--- !!! deriving Ix on d. type with one constructor
-module ShouldSucceed where
-
-import Data.Ix
-
-data Pair a b = Pair a b deriving (Show, Ord, Eq, Ix)
diff --git a/testsuite/tests/ghc-regress/deriving/should_compile/drv009.stderr b/testsuite/tests/ghc-regress/deriving/should_compile/drv009.stderr
deleted file mode 100644
index e69de29bb2..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_compile/drv009.stderr
+++ /dev/null
diff --git a/testsuite/tests/ghc-regress/deriving/should_compile/drv010.hs b/testsuite/tests/ghc-regress/deriving/should_compile/drv010.hs
deleted file mode 100644
index 1a3f9dc33a..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_compile/drv010.hs
+++ /dev/null
@@ -1,4 +0,0 @@
--- !!! deriving Enum on d. type with nullary constructors
-module ShouldSucceed where
-
-data AD = A | B | C | D deriving (Enum)
diff --git a/testsuite/tests/ghc-regress/deriving/should_compile/drv010.stderr b/testsuite/tests/ghc-regress/deriving/should_compile/drv010.stderr
deleted file mode 100644
index e69de29bb2..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_compile/drv010.stderr
+++ /dev/null
diff --git a/testsuite/tests/ghc-regress/deriving/should_compile/drv011.hs b/testsuite/tests/ghc-regress/deriving/should_compile/drv011.hs
deleted file mode 100644
index bba25f5cae..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_compile/drv011.hs
+++ /dev/null
@@ -1,6 +0,0 @@
--- !!! deriving Enum, but not Ord.
-module ShouldSucceed where
-
-data ABC = A | B | C deriving Enum
-
-x = [A ..C]
diff --git a/testsuite/tests/ghc-regress/deriving/should_compile/drv012.hs b/testsuite/tests/ghc-regress/deriving/should_compile/drv012.hs
deleted file mode 100644
index eb8f3847cd..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_compile/drv012.hs
+++ /dev/null
@@ -1,10 +0,0 @@
-{-# LANGUAGE GADTs #-}
-
--- !!! deriving for GADTs which declare Haskell98 data types.
--- bug reported as http://hackage.haskell.org/trac/ghc/ticket/902
-module ShouldSucceed where
-
-data Maybe1 a where {
- Nothing1 :: Maybe1 a ;
- Just1 :: a -> Maybe1 a
- } deriving (Eq,Ord)
diff --git a/testsuite/tests/ghc-regress/deriving/should_compile/drv013.hs b/testsuite/tests/ghc-regress/deriving/should_compile/drv013.hs
deleted file mode 100644
index 1686bcc232..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_compile/drv013.hs
+++ /dev/null
@@ -1,11 +0,0 @@
-{-# LANGUAGE DeriveDataTypeable #-}
-
--- Deriving Typeable has various special cases
-module Foo where
-
-import Data.Typeable
-
-data Foo1 = Foo1 deriving( Typeable )
-data Foo2 a = Foo2 a deriving( Typeable )
-data Foo3 a b = Foo3 a b deriving( Typeable )
-
diff --git a/testsuite/tests/ghc-regress/deriving/should_compile/drv014.hs b/testsuite/tests/ghc-regress/deriving/should_compile/drv014.hs
deleted file mode 100644
index 12e2a15b3f..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_compile/drv014.hs
+++ /dev/null
@@ -1,11 +0,0 @@
-{-# LANGUAGE StandaloneDeriving, GeneralizedNewtypeDeriving #-}
-
-module ShouldCompile where
-
-data T a = T1 a | T2
-newtype N = MkN Int
-
-deriving instance Eq a => Eq (T a)
-deriving instance Num N
-deriving instance Eq N
-deriving instance Show N
diff --git a/testsuite/tests/ghc-regress/deriving/should_compile/drv015.hs b/testsuite/tests/ghc-regress/deriving/should_compile/drv015.hs
deleted file mode 100644
index f8cfbce2db..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_compile/drv015.hs
+++ /dev/null
@@ -1,14 +0,0 @@
-
--- July 07: I'm changing this from "should_compile" to "should_fail".
--- It would generate an instance decl like
--- insance (Show (f a), Show (g a)) => Show (Pair1 f g a)
--- and that is not Haskell 98.
---
--- See Note [Exotic derived instance contexts] in TcSimplify.
--- The rule is simple: the context of a derived instance decl must
--- contain constraints of form (C tyvar) only, just as H98.
-
-module ShouldCompile where
-
-newtype Pair1 f g a = Pair1 {unPair1 :: (f a, g a)}
- deriving (Eq, Ord, Show)
diff --git a/testsuite/tests/ghc-regress/deriving/should_compile/drv020.hs b/testsuite/tests/ghc-regress/deriving/should_compile/drv020.hs
deleted file mode 100644
index 8794b745e5..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_compile/drv020.hs
+++ /dev/null
@@ -1,34 +0,0 @@
-{-# LANGUAGE MultiParamTypeClasses, FunctionalDependencies,
- FlexibleInstances, GeneralizedNewtypeDeriving #-}
-
--- Test deriving of a multi-parameter class for
--- one-argument newtype defined in the same module
-module ShouldSucceed where
-
--- library stuff
-
-class Monad m => MonadState s m | m -> s where
- get :: m s
- put :: s -> m ()
-
-newtype State s a = State {
- runState :: (s -> (a, s))
- }
-
-instance Monad (State s) where
- return a = State $ \s -> (a, s)
- m >>= k = State $ \s -> let
- (a, s') = runState m s
- in runState (k a) s'
-
-instance MonadState s (State s) where
- get = State $ \s -> (s, s)
- put s = State $ \_ -> ((), s)
-
--- test code
-
-newtype Foo a = MkFoo (State Int a)
- deriving (Monad, MonadState Int)
-
-f :: Foo Int
-f = get
diff --git a/testsuite/tests/ghc-regress/deriving/should_compile/drv021.hs b/testsuite/tests/ghc-regress/deriving/should_compile/drv021.hs
deleted file mode 100644
index c9800508de..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_compile/drv021.hs
+++ /dev/null
@@ -1,16 +0,0 @@
-{-# OPTIONS_GHC -XDeriveDataTypeable -XStandaloneDeriving #-}
-
--- See Trac #1825
--- Test stand-alone deriving for Typeable
--- Horridly, one needs to define instance for Typeable1 etc
-
-module ShouldCompile where
-
-import Data.Typeable
-
-data T1 a = T1 a
-data T2 a b = T2 a b
-
-deriving instance Typeable1 T1
-deriving instance Typeable2 T2
-
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/Makefile b/testsuite/tests/ghc-regress/deriving/should_fail/Makefile
deleted file mode 100644
index e527b6115d..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_fail/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
-
-drvfail016:
- $(RM) -f drvfail016.hi-boot drvfail016.o-boot
- '$(TEST_HC)' $(TEST_HC_OPTS) -XGeneralizedNewtypeDeriving -c drvfail016.hs-boot; echo $$?
-
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/T2394.hs b/testsuite/tests/ghc-regress/deriving/should_fail/T2394.hs
deleted file mode 100644
index 6e62bc364e..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_fail/T2394.hs
+++ /dev/null
@@ -1,9 +0,0 @@
-{-# OPTIONS_GHC -XDeriveDataTypeable -XStandaloneDeriving #-}
-
--- Test Trac #2394
-
-module Foo where
-
-import Data.Data(Data)
-
-deriving instance (Data a,Data b) => Data (a->b)
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/T2394.stderr b/testsuite/tests/ghc-regress/deriving/should_fail/T2394.stderr
deleted file mode 100644
index 9972186ed5..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_fail/T2394.stderr
+++ /dev/null
@@ -1,6 +0,0 @@
-
-T2394.hs:9:1:
- Can't make a derived instance of `Data (a -> b)':
- The last argument of the instance must be a data or newtype application
- In the stand-alone deriving instance for
- `(Data a, Data b) => Data (a -> b)'
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/T2604.hs b/testsuite/tests/ghc-regress/deriving/should_fail/T2604.hs
deleted file mode 100644
index 0f830d992b..0000000000
--- a/testsuite/tests/ghc-regress/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/ghc-regress/deriving/should_fail/T2604.stderr b/testsuite/tests/ghc-regress/deriving/should_fail/T2604.stderr
deleted file mode 100644
index fa09654c5b..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_fail/T2604.stderr
+++ /dev/null
@@ -1,10 +0,0 @@
-
-T2604.hs:7:35:
- Can't make a derived instance of `Typeable (DList a)':
- You need -XDeriveDataTypeable to derive an instance for this class
- In the data type declaration for `DList'
-
-T2604.hs:9:38:
- Can't make a derived instance of `Typeable (NList a)':
- You need -XDeriveDataTypeable to derive an instance for this class
- In the newtype declaration for `NList'
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/T2604.stderr-7.0 b/testsuite/tests/ghc-regress/deriving/should_fail/T2604.stderr-7.0
deleted file mode 100644
index aa996e0f87..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_fail/T2604.stderr-7.0
+++ /dev/null
@@ -1,11 +0,0 @@
-
-T2604.hs:7:35:
- Can't make a derived instance of `Typeable (DList a)':
- You need -XDeriveDataTypeable to derive an instance for this class
- In the data type declaration for `DList'
-
-T2604.hs:9:38:
- Can't make a derived instance of `Typeable (NList a)'
- (even with cunning newtype deriving):
- You need -XDeriveDataTypeable to derive an instance for this class
- In the newtype declaration for `NList'
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/T2701.hs b/testsuite/tests/ghc-regress/deriving/should_fail/T2701.hs
deleted file mode 100644
index 37bffc827d..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_fail/T2701.hs
+++ /dev/null
@@ -1,10 +0,0 @@
-{-# LANGUAGE MagicHash, DeriveDataTypeable #-}
-module T2700 where
-
-import GHC.Prim
-
-import Data.Data
-import Data.Typeable
-
-data Foo = MkFoo Int#
- deriving (Typeable, Data)
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/T2701.stderr b/testsuite/tests/ghc-regress/deriving/should_fail/T2701.stderr
deleted file mode 100644
index a9181accc1..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_fail/T2701.stderr
+++ /dev/null
@@ -1,5 +0,0 @@
-
-T2701.hs:10:32:
- Can't make a derived instance of `Data Foo':
- Constructor `MkFoo' must have only arguments of lifted type
- In the data type declaration for `Foo'
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/T2721.hs b/testsuite/tests/ghc-regress/deriving/should_fail/T2721.hs
deleted file mode 100644
index f6485ce514..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_fail/T2721.hs
+++ /dev/null
@@ -1,15 +0,0 @@
-{-# LANGUAGE TypeFamilies, GeneralizedNewtypeDeriving #-}
-
--- Trac #2721
-
-module T2721 where
-
-class C a where
- type T a
- foo :: a -> T a
-
-instance C Int where
- type T Int = Int
- foo = id
-
-newtype N = N Int deriving(C)
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/T2721.stderr b/testsuite/tests/ghc-regress/deriving/should_fail/T2721.stderr
deleted file mode 100644
index 03339d3bfa..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_fail/T2721.stderr
+++ /dev/null
@@ -1,6 +0,0 @@
-
-T2721.hs:15:28:
- Can't make a derived instance of `C N'
- (even with cunning newtype deriving):
- the class has associated types
- In the newtype declaration for `N'
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/T2851.hs b/testsuite/tests/ghc-regress/deriving/should_fail/T2851.hs
deleted file mode 100644
index bc7239af0a..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_fail/T2851.hs
+++ /dev/null
@@ -1,9 +0,0 @@
-{-# LANGUAGE TypeFamilies #-}
--- Test Trac #2851
-
-module T2851 where
-
-type family F a :: *
-
-data D a = D (F a)
- deriving (Show)
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/T2851.stderr b/testsuite/tests/ghc-regress/deriving/should_fail/T2851.stderr
deleted file mode 100644
index a2beb9869d..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_fail/T2851.stderr
+++ /dev/null
@@ -1,9 +0,0 @@
-
-T2851.hs:9:15:
- No instance for (Show (F a))
- arising from the 'deriving' clause of a data type declaration
- Possible fix:
- add an instance declaration for (Show (F a))
- or use a standalone 'deriving instance' declaration,
- so you can specify the instance context yourself
- When deriving the instance for (Show (D a))
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/T3101.hs b/testsuite/tests/ghc-regress/deriving/should_fail/T3101.hs
deleted file mode 100644
index 134694a4fe..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_fail/T3101.hs
+++ /dev/null
@@ -1,9 +0,0 @@
-{-# LANGUAGE TypeFamilies #-}
-{-# LANGUAGE RankNTypes #-}
-
-module T3101 where
-
-type family F a :: *
-
-data Boom = Boom (forall a. F a)
- deriving Show
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/T3101.stderr b/testsuite/tests/ghc-regress/deriving/should_fail/T3101.stderr
deleted file mode 100644
index 34f423daff..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_fail/T3101.stderr
+++ /dev/null
@@ -1,6 +0,0 @@
-
-T3101.hs:9:12:
- Can't make a derived instance of `Show Boom':
- Constructor `Boom' must have a Haskell-98 type
- Possible fix: use a standalone deriving declaration instead
- In the data type declaration for `Boom'
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/T3621.hs b/testsuite/tests/ghc-regress/deriving/should_fail/T3621.hs
deleted file mode 100644
index cd574eab81..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_fail/T3621.hs
+++ /dev/null
@@ -1,36 +0,0 @@
-{-# LANGUAGE GeneralizedNewtypeDeriving, MultiParamTypeClasses, FlexibleInstances, FunctionalDependencies, FlexibleContexts, UndecidableInstances, StandaloneDeriving #-}
-module T3621 where
-
--- This one is ok, even though the deriving clause mentions 'a'
--- which is not a parameter of 'T'
-class C a b
-instance C a S
-data S = MkS
-
-newtype T = MkT S deriving( C a )
-
-
--- But this one fails, and should fail
-class (Monad m) => MonadState s m | m -> s where
-
-newtype State s a = State { runState :: s -> (a, s) }
-instance Monad (State s) where {}
-instance MonadState s (State s) where {}
-
-newtype WrappedState s a = WS { runWS :: State s a }
- deriving (Monad, MonadState state)
--- deriving (Monad)
-
-deriving instance (MonadState state (State s))
- => MonadState state (WrappedState s)
-
--- ASSERT error
--- deriving instance (MonadState state (State s), Monad (WrappedState s))
--- => MonadState s (WrappedState s)
-
-
--- We try
--- instance MonadState state (State state a)
--- => MonadState state (WrappedState state a)
---
--- Superclass needs (Monad (WrappedState state a))
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/T3621.stderr b/testsuite/tests/ghc-regress/deriving/should_fail/T3621.stderr
deleted file mode 100644
index dc9dc849ab..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_fail/T3621.stderr
+++ /dev/null
@@ -1,13 +0,0 @@
-
-T3621.hs:21:21:
- Couldn't match type `s' with `state'
- `s' is an unknown type variable
- `state' is an unknown type variable
- When using functional dependencies to combine
- MonadState s (State s),
- arising from the dependency `m -> s'
- in the instance declaration at T3621.hs:18:10
- MonadState state (State s),
- arising from the 'deriving' clause of a data type declaration
- at T3621.hs:21:21-36
- When deriving the instance for (MonadState state (WrappedState s))
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/T3833.hs b/testsuite/tests/ghc-regress/deriving/should_fail/T3833.hs
deleted file mode 100644
index d1196c4112..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_fail/T3833.hs
+++ /dev/null
@@ -1,9 +0,0 @@
-
-{-# LANGUAGE StandaloneDeriving #-}
--- {-# LANGUAGE GeneralizedNewtypeDeriving #-}
-
-import Data.Monoid
-
-newtype DecodeMap e = DecodeMap [e]
-
-deriving instance Monoid (DecodeMap e)
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/T3833.stderr b/testsuite/tests/ghc-regress/deriving/should_fail/T3833.stderr
deleted file mode 100644
index 2d31cc1364..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_fail/T3833.stderr
+++ /dev/null
@@ -1,6 +0,0 @@
-
-T3833.hs:9:1:
- Can't make a derived instance of `Monoid (DecodeMap e)':
- `Monoid' is not a derivable class
- Try -XGeneralizedNewtypeDeriving for GHC's newtype-deriving extension
- In the stand-alone deriving instance for `Monoid (DecodeMap e)'
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/T3834.hs b/testsuite/tests/ghc-regress/deriving/should_fail/T3834.hs
deleted file mode 100644
index 614170198e..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_fail/T3834.hs
+++ /dev/null
@@ -1,9 +0,0 @@
-
-{-# LANGUAGE StandaloneDeriving #-}
-
-class C a
-instance C Int
-
-newtype T = T Int
-deriving instance C T
-
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/T3834.stderr b/testsuite/tests/ghc-regress/deriving/should_fail/T3834.stderr
deleted file mode 100644
index 199b4bb799..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_fail/T3834.stderr
+++ /dev/null
@@ -1,6 +0,0 @@
-
-T3834.hs:8:1:
- Can't make a derived instance of `C T':
- `C' is not a derivable class
- Try -XGeneralizedNewtypeDeriving for GHC's newtype-deriving extension
- In the stand-alone deriving instance for `C T'
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/T4528.hs b/testsuite/tests/ghc-regress/deriving/should_fail/T4528.hs
deleted file mode 100644
index 23a8510d98..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_fail/T4528.hs
+++ /dev/null
@@ -1,11 +0,0 @@
-{-# LANGUAGE GADTs, StandaloneDeriving #-}
-
-module T4528 where
-
-data Foo a where
- A, B :: Foo Int
- C :: Foo Bool
-
-deriving instance Enum (Foo a)
-deriving instance Bounded (Foo a)
-
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/T4528.stderr b/testsuite/tests/ghc-regress/deriving/should_fail/T4528.stderr
deleted file mode 100644
index 8f008e8908..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_fail/T4528.stderr
+++ /dev/null
@@ -1,14 +0,0 @@
-
-T4528.hs:9:1:
- Can't make a derived instance of `Enum (Foo a)':
- `Foo' must be an enumeration type
- (an enumeration consists of one or more nullary, non-GADT constructors)
- In the stand-alone deriving instance for `Enum (Foo a)'
-
-T4528.hs:10:1:
- Can't make a derived instance of `Bounded (Foo a)':
- `Foo' must be an enumeration type
- (an enumeration consists of one or more nullary, non-GADT constructors)
- or
- `Foo' must have precisely one constructor
- In the stand-alone deriving instance for `Bounded (Foo a)'
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/all.T b/testsuite/tests/ghc-regress/deriving/should_fail/all.T
deleted file mode 100644
index 8fa5e27e60..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_fail/all.T
+++ /dev/null
@@ -1,35 +0,0 @@
-
-test('drvfail001', normal, compile_fail, [''])
-test('drvfail002', normal, compile_fail, [''])
-test('drvfail003', normal, compile_fail, [''])
-test('drvfail004', normal, compile_fail, [''])
-test('drvfail005', normal, compile_fail, [''])
-test('drvfail006', reqlib('mtl'), compile_fail, [''])
-test('drvfail007', normal, compile_fail, [''])
-test('drvfail008', reqlib('mtl'), compile_fail, [''])
-test('drvfail009', normal, compile_fail, [''])
-test('drvfail010', normal, compile_fail, [''])
-test('drvfail011', normal, compile_fail, [''])
-test('drvfail012', normal, compile_fail, [''])
-test('drvfail013', normal, compile_fail, [''])
-test('drvfail014', normal, compile_fail, [''])
-test('drvfail015', normal, compile_fail, [''])
-test('drvfail016',
- extra_clean(['drvfail016.hi-boot', 'drvfail016.o-boot']),
- run_command,
- ['$MAKE --no-print-directory -s drvfail016'])
-test('T2394', normal, compile_fail, [''])
-test('T2604', normal, compile_fail, [''])
-test('T2701', normal, compile_fail, [''])
-test('T2851', normal, compile_fail, [''])
-test('T2721', normal, compile_fail, [''])
-test('T3101', normal, compile_fail, [''])
-test('T3621', normal, compile_fail, [''])
-test('drvfail-functor1', normal, compile_fail, [''])
-test('drvfail-functor2', normal, compile_fail, [''])
-test('drvfail-foldable-traversable1', normal, compile_fail,
- [''])
-test('T3833', normal, compile_fail, [''])
-test('T3834', normal, compile_fail, [''])
-test('T4528', normal, compile_fail, [''])
-
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail-foldable-traversable1.hs b/testsuite/tests/ghc-regress/deriving/should_fail/drvfail-foldable-traversable1.hs
deleted file mode 100644
index ced3f98c63..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail-foldable-traversable1.hs
+++ /dev/null
@@ -1,21 +0,0 @@
-{-# LANGUAGE DeriveFunctor, DeriveFoldable, DeriveTraversable #-}
-module ShouldFail where
-
-import Data.Foldable
-import Data.Traversable
-
--- Derive Traversable without Functor
-data Trivial1 a = Trivial1 a
- deriving (Foldable,Traversable)
-
--- Derive Traversable without Foldable
-data Trivial2 a = Trivial2 a
- deriving (Functor,Traversable)
-
--- Foldable with function type
-data Infinite a = Infinite (Int -> a)
- deriving (Functor,Foldable,Traversable)
-
--- Foldable with function type
-data Cont r a = Cont ((a -> r) -> r)
- deriving (Functor,Foldable,Traversable)
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail-foldable-traversable1.stderr b/testsuite/tests/ghc-regress/deriving/should_fail/drvfail-foldable-traversable1.stderr
deleted file mode 100644
index ecd20e8372..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail-foldable-traversable1.stderr
+++ /dev/null
@@ -1,38 +0,0 @@
-
-drvfail-foldable-traversable1.hs:9:23:
- No instance for (Functor Trivial1)
- arising from the 'deriving' clause of a data type declaration
- Possible fix:
- add an instance declaration for (Functor Trivial1)
- or use a standalone 'deriving instance' declaration,
- so you can specify the instance context yourself
- When deriving the instance for (Traversable Trivial1)
-
-drvfail-foldable-traversable1.hs:13:22:
- No instance for (Foldable Trivial2)
- arising from the 'deriving' clause of a data type declaration
- Possible fix:
- add an instance declaration for (Foldable Trivial2)
- or use a standalone 'deriving instance' declaration,
- so you can specify the instance context yourself
- When deriving the instance for (Traversable Trivial2)
-
-drvfail-foldable-traversable1.hs:17:22:
- Can't make a derived instance of `Foldable Infinite':
- Constructor `Infinite' must not contain function types
- In the data type declaration for `Infinite'
-
-drvfail-foldable-traversable1.hs:17:31:
- Can't make a derived instance of `Traversable Infinite':
- Constructor `Infinite' must not contain function types
- In the data type declaration for `Infinite'
-
-drvfail-foldable-traversable1.hs:21:22:
- Can't make a derived instance of `Foldable (Cont r)':
- Constructor `Cont' must not contain function types
- In the data type declaration for `Cont'
-
-drvfail-foldable-traversable1.hs:21:31:
- Can't make a derived instance of `Traversable (Cont r)':
- Constructor `Cont' must not contain function types
- In the data type declaration for `Cont'
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail-functor1.hs b/testsuite/tests/ghc-regress/deriving/should_fail/drvfail-functor1.hs
deleted file mode 100644
index 94ebd925b8..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail-functor1.hs
+++ /dev/null
@@ -1,6 +0,0 @@
-module ShouldFail where
-
--- Derive Functor without a DeriveFunctor language pragma
-
-data List a = Nil | Cons a (List a)
- deriving Functor
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail-functor1.stderr b/testsuite/tests/ghc-regress/deriving/should_fail/drvfail-functor1.stderr
deleted file mode 100644
index d221f99f9d..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail-functor1.stderr
+++ /dev/null
@@ -1,5 +0,0 @@
-
-drvfail-functor1.hs:6:14:
- Can't make a derived instance of `Functor List':
- You need -XDeriveFunctor to derive an instance for this class
- In the data type declaration for `List'
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail-functor2.hs b/testsuite/tests/ghc-regress/deriving/should_fail/drvfail-functor2.hs
deleted file mode 100644
index 7198755b80..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail-functor2.hs
+++ /dev/null
@@ -1,26 +0,0 @@
-{-# LANGUAGE DeriveFunctor, DatatypeContexts #-}
-module ShouldFail where
-
--- Derive Functor on a type that uses 'a' in the wrong places
-
-newtype InFunctionArgument a = InFunctionArgument (a -> Int)
- deriving (Functor)
-
-newtype OnSecondArg a = OnSecondArg (Either a a)
- deriving (Functor)
-
--- Derive Functor on a type with no arguments
-
-newtype NoArguments = NoArguments Int
- deriving (Functor)
-
--- Derive Functor on a type with extra stupid-contraints on 'a'
-
-data Eq a => StupidConstraint a = StupidType a
- deriving (Functor)
-
--- A missing Functor instance
-
-data NoFunctor a = NoFunctor
-data UseNoFunctor a = UseNoFunctor (NoFunctor a)
- deriving (Functor)
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail-functor2.stderr b/testsuite/tests/ghc-regress/deriving/should_fail/drvfail-functor2.stderr
deleted file mode 100644
index 7ce404666f..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail-functor2.stderr
+++ /dev/null
@@ -1,32 +0,0 @@
-
-drvfail-functor2.hs:1:29:
- Warning: -XDatatypeContexts is deprecated: It was widely considered a misfeature, and has been removed from the Haskell language.
-
-drvfail-functor2.hs:7:14:
- Can't make a derived instance of `Functor InFunctionArgument':
- Constructor `InFunctionArgument' must not use the type variable in a function argument
- In the newtype declaration for `InFunctionArgument'
-
-drvfail-functor2.hs:10:14:
- Can't make a derived instance of `Functor OnSecondArg':
- Constructor `OnSecondArg' must not use the type variable in an argument other than the last
- In the newtype declaration for `OnSecondArg'
-
-drvfail-functor2.hs:15:14:
- Cannot derive well-kinded instance of form `Functor (NoArguments ...)'
- Class `Functor' expects an argument of kind `* -> *'
- In the newtype declaration for `NoArguments'
-
-drvfail-functor2.hs:20:14:
- Can't make a derived instance of `Functor StupidConstraint':
- Data type `StupidConstraint' must not have a class context (Eq a)
- In the data type declaration for `StupidConstraint'
-
-drvfail-functor2.hs:26:14:
- No instance for (Functor NoFunctor)
- arising from the 'deriving' clause of a data type declaration
- Possible fix:
- add an instance declaration for (Functor NoFunctor)
- or use a standalone 'deriving instance' declaration,
- so you can specify the instance context yourself
- When deriving the instance for (Functor UseNoFunctor)
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail001.hs b/testsuite/tests/ghc-regress/deriving/should_fail/drvfail001.hs
deleted file mode 100644
index 47447fb3e3..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail001.hs
+++ /dev/null
@@ -1,26 +0,0 @@
-{- From: Ian Bayley
- Sent: Tuesday, June 29, 1999 3:39 PM
- To: hugs-bugs@haskell.org
- Subject: Show for higher-order nested datatypes
-
-
- Is "deriving Show" meant to work for higher-order nested datatypes ?
- Hugs hangs when loading in the following file:
--}
-
-module Foo where
-
-type SqMat a = SM Nil a
-
-data SM f a = ZeroS (f (f a)) | SuccS (SM (Cons f) a)
- deriving Show
-
--- Show (f (f a)), Show (SM (Cons f) a) => Show (SM f a)
-
-data Nil a = MkNil deriving Show
-
-data Cons f a = MkCons a (f a)
- deriving Show
-
-
-
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail001.stderr b/testsuite/tests/ghc-regress/deriving/should_fail/drvfail001.stderr
deleted file mode 100644
index a2a149594c..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail001.stderr
+++ /dev/null
@@ -1,9 +0,0 @@
-
-drvfail001.hs:16:33:
- No instance for (Show (f (f a)))
- arising from the 'deriving' clause of a data type declaration
- Possible fix:
- add an instance declaration for (Show (f (f a)))
- or use a standalone 'deriving instance' declaration,
- so you can specify the instance context yourself
- When deriving the instance for (Show (SM f a))
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail002.hs b/testsuite/tests/ghc-regress/deriving/should_fail/drvfail002.hs
deleted file mode 100644
index 26a8f083d2..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail002.hs
+++ /dev/null
@@ -1,20 +0,0 @@
-{-# LANGUAGE UndecidableInstances,
- MultiParamTypeClasses, FunctionalDependencies #-}
-
--- The Show instance for S would have form
--- instance X T c => Show S
--- which is hard to deal with. It sent GHC 5.01 into
--- an infinite loop; now it should be rejected.
-
-module ShouldFail where
-
-data T = T Integer
-
-class X a b | a -> b where
- f :: a -> b
-
-instance X T c => Show T where
- show _ = ""
-
-data S = S T deriving Show
-
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail002.stderr b/testsuite/tests/ghc-regress/deriving/should_fail/drvfail002.stderr
deleted file mode 100644
index c174c69055..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail002.stderr
+++ /dev/null
@@ -1,6 +0,0 @@
-
-drvfail002.hs:16:10:
- Ambiguous constraint `X T c'
- At least one of the forall'd type variables mentioned by the constraint
- must be reachable from the type after the '=>'
- In the instance declaration for `Show T'
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail002.stderr-hugs b/testsuite/tests/ghc-regress/deriving/should_fail/drvfail002.stderr-hugs
deleted file mode 100644
index b67a94ef5c..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail002.stderr-hugs
+++ /dev/null
@@ -1 +0,0 @@
-ERROR "drvfail002.hs":18 - An instance of X T a is required to derive Show S
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail003.hs b/testsuite/tests/ghc-regress/deriving/should_fail/drvfail003.hs
deleted file mode 100644
index 5d22dc1d4a..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail003.hs
+++ /dev/null
@@ -1,16 +0,0 @@
-{-# LANGUAGE FlexibleContexts #-}
--- Made GHC 5.02.2 go into a loop when doing the
--- context inference for deriving. It only happened with
--- the -fglasgow-exts flag (it didn't diverge without),
--- so hopefully FlexibleContexts is the relevant extension.
-
-module ShouldFail where
-
-data Empty a = E
-newtype Id a = I a
-newtype Pair v w a = P ((v a), (w a))
-type Square a = Square_ Empty Id a
-data Square_ v w a =
- End (v (v a))
- | Zero (Square_ v (Pair w w) a)
- | One (Square_ (Pair v w) (Pair w w) a) deriving Show
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail003.stderr b/testsuite/tests/ghc-regress/deriving/should_fail/drvfail003.stderr
deleted file mode 100644
index 4aa98531b8..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail003.stderr
+++ /dev/null
@@ -1,9 +0,0 @@
-
-drvfail003.hs:16:56:
- No instance for (Show (v (v a)))
- arising from the 'deriving' clause of a data type declaration
- Possible fix:
- add an instance declaration for (Show (v (v a)))
- or use a standalone 'deriving instance' declaration,
- so you can specify the instance context yourself
- When deriving the instance for (Show (Square_ v w a))
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail003.stderr-hugs b/testsuite/tests/ghc-regress/deriving/should_fail/drvfail003.stderr-hugs
deleted file mode 100644
index 0dab54095c..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail003.stderr-hugs
+++ /dev/null
@@ -1 +0,0 @@
-ERROR "drvfail003.hs":13 - An instance of Show (Pair a b (Pair a b c)) is required to derive Show (Square_ a b c)
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail004.hs b/testsuite/tests/ghc-regress/deriving/should_fail/drvfail004.hs
deleted file mode 100644
index 8716a5837f..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail004.hs
+++ /dev/null
@@ -1,9 +0,0 @@
--- !!! deriving Ord without deriving Eq
---
-module ShouldFail where
-
-data Foo a b
- = C1 a Int
- | C2 b Double
- deriving Ord
-
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail004.stderr b/testsuite/tests/ghc-regress/deriving/should_fail/drvfail004.stderr
deleted file mode 100644
index d08f315cb7..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail004.stderr
+++ /dev/null
@@ -1,9 +0,0 @@
-
-drvfail004.hs:8:12:
- No instance for (Eq (Foo a b))
- arising from the 'deriving' clause of a data type declaration
- Possible fix:
- add an instance declaration for (Eq (Foo a b))
- or use a standalone 'deriving instance' declaration,
- so you can specify the instance context yourself
- When deriving the instance for (Ord (Foo a b))
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail004.stderr-hugs b/testsuite/tests/ghc-regress/deriving/should_fail/drvfail004.stderr-hugs
deleted file mode 100644
index 4370d8e96c..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail004.stderr-hugs
+++ /dev/null
@@ -1,4 +0,0 @@
-ERROR "drvfail004.hs":6 - Cannot build superclass instance
-*** Instance : Ord (Foo a b)
-*** Context supplied : (Ord a, Ord b)
-*** Required superclass : Eq (Foo a b)
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail005.hs b/testsuite/tests/ghc-regress/deriving/should_fail/drvfail005.hs
deleted file mode 100644
index ee44e2f343..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail005.hs
+++ /dev/null
@@ -1,4 +0,0 @@
-module ShouldFail where
-
-data Test a = T a
- deriving( Show a, Read )
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail005.stderr b/testsuite/tests/ghc-regress/deriving/should_fail/drvfail005.stderr
deleted file mode 100644
index e27f3c1fd2..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail005.stderr
+++ /dev/null
@@ -1,5 +0,0 @@
-
-drvfail005.hs:4:13:
- Can't make a derived instance of `Show a (Test a)':
- `Show a' is not a class
- In the data type declaration for `Test'
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail006.hs b/testsuite/tests/ghc-regress/deriving/should_fail/drvfail006.hs
deleted file mode 100644
index 0d8d1a95d9..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail006.hs
+++ /dev/null
@@ -1,11 +0,0 @@
-{-# LANGUAGE GeneralizedNewtypeDeriving #-}
-
--- Testing the newtype-deriving stuff
-
-module ShouldFail where
-
-import Control.Monad.State
-
-newtype T a = T (StateT Int IO a) deriving( MonadState )
- -- Here MonadState takes two type params,
- -- but exactly one is needed. \ No newline at end of file
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail006.stderr b/testsuite/tests/ghc-regress/deriving/should_fail/drvfail006.stderr
deleted file mode 100644
index 018291b6bb..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail006.stderr
+++ /dev/null
@@ -1,6 +0,0 @@
-
-drvfail006.hs:9:45:
- Can't make a derived instance of `MonadState T'
- (even with cunning newtype deriving):
- `MonadState' does not have arity 1
- In the newtype declaration for `T'
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail006.stderr-hugs b/testsuite/tests/ghc-regress/deriving/should_fail/drvfail006.stderr-hugs
deleted file mode 100644
index b4c1c277a0..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail006.stderr-hugs
+++ /dev/null
@@ -1 +0,0 @@
-ERROR "drvfail006.hs":9 - Cannot derive instances of class "MonadState"
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail007.hs b/testsuite/tests/ghc-regress/deriving/should_fail/drvfail007.hs
deleted file mode 100644
index 74f9f033d3..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail007.hs
+++ /dev/null
@@ -1,4 +0,0 @@
--- !!! buggy deriving with function type, reported by Sigbjorn Finne
-module ShouldFail where
-
-data Foo = Foo (Int -> Int) deriving Eq
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail007.stderr b/testsuite/tests/ghc-regress/deriving/should_fail/drvfail007.stderr
deleted file mode 100644
index 7dc7124fd1..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail007.stderr
+++ /dev/null
@@ -1,9 +0,0 @@
-
-drvfail007.hs:4:38:
- No instance for (Eq (Int -> Int))
- arising from the 'deriving' clause of a data type declaration
- Possible fix:
- add an instance declaration for (Eq (Int -> Int))
- or use a standalone 'deriving instance' declaration,
- so you can specify the instance context yourself
- When deriving the instance for (Eq Foo)
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail007.stderr-hugs b/testsuite/tests/ghc-regress/deriving/should_fail/drvfail007.stderr-hugs
deleted file mode 100644
index 3285aeeb78..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail007.stderr-hugs
+++ /dev/null
@@ -1 +0,0 @@
-ERROR "drvfail007.hs":4 - An instance of Eq (Int -> Int) is required to derive Eq Foo
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail008.hs b/testsuite/tests/ghc-regress/deriving/should_fail/drvfail008.hs
deleted file mode 100644
index af8628b4d5..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail008.hs
+++ /dev/null
@@ -1,14 +0,0 @@
--- Should fail without GeneralizedNewtypeDeriving
--- Succeeds with GeneralizedNewtypeDeriving
-
-module ShouldFail where
-
-import Control.Monad.State
-
-data S = S Int
-
-newtype M a = M (StateT S IO a) deriving( Monad )
-
-
-
-
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail008.stderr b/testsuite/tests/ghc-regress/deriving/should_fail/drvfail008.stderr
deleted file mode 100644
index 9b56dfb1d7..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail008.stderr
+++ /dev/null
@@ -1,6 +0,0 @@
-
-drvfail008.hs:10:43:
- Can't make a derived instance of `Monad M':
- `Monad' is not a derivable class
- Try -XGeneralizedNewtypeDeriving for GHC's newtype-deriving extension
- In the newtype declaration for `M'
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail009.hs b/testsuite/tests/ghc-regress/deriving/should_fail/drvfail009.hs
deleted file mode 100644
index 06155c38a1..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail009.hs
+++ /dev/null
@@ -1,20 +0,0 @@
-{-# LANGUAGE GeneralizedNewtypeDeriving, MultiParamTypeClasses #-}
-
--- Various newtype-deriving failures
-
-module ShouldFail where
-
-
-class C a b
-
-newtype T1 = T1 Int deriving( C )
- -- Wrong arity
-
-newtype T2 = T2 Int deriving( Monad )
- -- Type constructor has wrong kind
-
-newtype T3 a = T3 Int deriving( Monad )
- -- Rep type has wrong kind
-
-newtype T4 a = T4 (Either a a) deriving( Monad )
- -- Eta fails
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail009.stderr b/testsuite/tests/ghc-regress/deriving/should_fail/drvfail009.stderr
deleted file mode 100644
index 7594baef39..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail009.stderr
+++ /dev/null
@@ -1,23 +0,0 @@
-
-drvfail009.hs:10:31:
- Can't make a derived instance of `C T1'
- (even with cunning newtype deriving):
- `C' does not have arity 1
- In the newtype declaration for `T1'
-
-drvfail009.hs:13:31:
- Cannot derive well-kinded instance of form `Monad (T2 ...)'
- Class `Monad' expects an argument of kind `* -> *'
- In the newtype declaration for `T2'
-
-drvfail009.hs:16:33:
- Can't make a derived instance of `Monad T3'
- (even with cunning newtype deriving):
- cannot eta-reduce the representation type enough
- In the newtype declaration for `T3'
-
-drvfail009.hs:19:42:
- Can't make a derived instance of `Monad T4'
- (even with cunning newtype deriving):
- cannot eta-reduce the representation type enough
- In the newtype declaration for `T4'
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail009.stderr-hugs b/testsuite/tests/ghc-regress/deriving/should_fail/drvfail009.stderr-hugs
deleted file mode 100644
index 79fba84f61..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail009.stderr-hugs
+++ /dev/null
@@ -1 +0,0 @@
-ERROR "drvfail009.hs":10 - Cannot derive instances of class "C"
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail010.hs b/testsuite/tests/ghc-regress/deriving/should_fail/drvfail010.hs
deleted file mode 100644
index efecf07cf1..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail010.hs
+++ /dev/null
@@ -1,10 +0,0 @@
-{-# LANGUAGE DeriveDataTypeable #-}
-
-module ShouldFail where
-import Data.Typeable
-
-data A a b c d e f g h i j = A deriving (Typeable)
- -- Too many args
-
-data B a b = B (a b) deriving (Typeable)
- -- Non type-kind args \ No newline at end of file
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail010.stderr b/testsuite/tests/ghc-regress/deriving/should_fail/drvfail010.stderr
deleted file mode 100644
index a61fb4892f..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail010.stderr
+++ /dev/null
@@ -1,11 +0,0 @@
-
-drvfail010.hs:6:42:
- Can't make a derived instance of
- `Typeable (A a b c d e f g h i j)':
- `A' must have 7 or fewer arguments
- In the data type declaration for `A'
-
-drvfail010.hs:9:32:
- Can't make a derived instance of `Typeable (B a b)':
- `B' must only have arguments of kind `*'
- In the data type declaration for `B'
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail010.stderr-hugs b/testsuite/tests/ghc-regress/deriving/should_fail/drvfail010.stderr-hugs
deleted file mode 100644
index f6479975a5..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail010.stderr-hugs
+++ /dev/null
@@ -1 +0,0 @@
-ERROR "drvfail010.hs":6 - Cannot derive instances of class "Typeable"
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail011.hs b/testsuite/tests/ghc-regress/deriving/should_fail/drvfail011.hs
deleted file mode 100644
index 33e35c4d83..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail011.hs
+++ /dev/null
@@ -1,8 +0,0 @@
-{-# LANGUAGE StandaloneDeriving #-}
-
-module ShouldFail where
-
-data T a = T1 a | T2
-
--- This fails as we need an (Eq a) context
-deriving instance Eq (T a)
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail011.stderr b/testsuite/tests/ghc-regress/deriving/should_fail/drvfail011.stderr
deleted file mode 100644
index 80e486628b..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail011.stderr
+++ /dev/null
@@ -1,10 +0,0 @@
-
-drvfail011.hs:8:1:
- No instance for (Eq a)
- arising from a use of `=='
- In the expression: ((a1 == b1))
- In an equation for `==': == (T1 a1) (T1 b1) = ((a1 == b1))
- When typechecking the code for `=='
- in a standalone derived instance for `Eq (T a)':
- To see the code I am typechecking, use -ddump-deriv
- In the instance declaration for `Eq (T a)'
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail012.hs b/testsuite/tests/ghc-regress/deriving/should_fail/drvfail012.hs
deleted file mode 100644
index 4a073bbed1..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail012.hs
+++ /dev/null
@@ -1,8 +0,0 @@
--- Trac #1608
-
-module ShouldFail where
-
-newtype Ego a = Ego a deriving (Ord)
-
-f :: Ord a => Ego a -> Ego a -> Bool
-f e1 e2 = e1 < e2
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail012.stderr b/testsuite/tests/ghc-regress/deriving/should_fail/drvfail012.stderr
deleted file mode 100644
index 22fac4887d..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail012.stderr
+++ /dev/null
@@ -1,9 +0,0 @@
-
-drvfail012.hs:5:33:
- No instance for (Eq (Ego a))
- arising from the 'deriving' clause of a data type declaration
- Possible fix:
- add an instance declaration for (Eq (Ego a))
- or use a standalone 'deriving instance' declaration,
- so you can specify the instance context yourself
- When deriving the instance for (Ord (Ego a))
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail013.hs b/testsuite/tests/ghc-regress/deriving/should_fail/drvfail013.hs
deleted file mode 100644
index d8a7322dba..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail013.hs
+++ /dev/null
@@ -1,6 +0,0 @@
-
--- Test for trac #1588: unrequested generalized newtype deriving?
-
-newtype MaybeT m a = MaybeT { runMaybeT :: m (Maybe a) } deriving Eq
-
-data MaybeT' m a = MaybeT' { runMaybeT' :: m (Maybe a) } deriving Eq
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail013.stderr b/testsuite/tests/ghc-regress/deriving/should_fail/drvfail013.stderr
deleted file mode 100644
index 94927cd790..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail013.stderr
+++ /dev/null
@@ -1,18 +0,0 @@
-
-drvfail013.hs:4:70:
- No instance for (Eq (m (Maybe a)))
- arising from the 'deriving' clause of a data type declaration
- Possible fix:
- add an instance declaration for (Eq (m (Maybe a)))
- or use a standalone 'deriving instance' declaration,
- so you can specify the instance context yourself
- When deriving the instance for (Eq (MaybeT m a))
-
-drvfail013.hs:6:70:
- No instance for (Eq (m (Maybe a)))
- arising from the 'deriving' clause of a data type declaration
- Possible fix:
- add an instance declaration for (Eq (m (Maybe a)))
- or use a standalone 'deriving instance' declaration,
- so you can specify the instance context yourself
- When deriving the instance for (Eq (MaybeT' m a))
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail014.hs b/testsuite/tests/ghc-regress/deriving/should_fail/drvfail014.hs
deleted file mode 100644
index 9039332f29..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail014.hs
+++ /dev/null
@@ -1,13 +0,0 @@
-{-# OPTIONS_GHC -XDeriveDataTypeable -XStandaloneDeriving #-}
-
--- See Trac #1825
-
-module ShouldFail where
-import Data.Typeable
-
-data T1 a = T1 a deriving( Typeable1 )
-
-data T2 a b = T2 a b
-
-deriving instance (Typeable a, Typeable b) => Typeable (T2 a b)
- -- c.f. drv021.hs
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail014.stderr b/testsuite/tests/ghc-regress/deriving/should_fail/drvfail014.stderr
deleted file mode 100644
index 865a78c44e..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail014.stderr
+++ /dev/null
@@ -1,9 +0,0 @@
-
-drvfail014.hs:8:28:
- Use deriving( Typeable ) on a data type declaration
- In the data type declaration for `T1'
-
-drvfail014.hs:12:1:
- Derived typeable instance must be of form (Typeable2 T2)
- In the stand-alone deriving instance for
- `(Typeable a, Typeable b) => Typeable (T2 a b)'
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail015.hs b/testsuite/tests/ghc-regress/deriving/should_fail/drvfail015.hs
deleted file mode 100644
index 32d6134d34..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail015.hs
+++ /dev/null
@@ -1,13 +0,0 @@
-{-# OPTIONS_GHC -XStandaloneDeriving #-}
-
-module ShouldFail where
-
-import System.IO( Handle )
-
-
--- T is a synonym
-type T = Int
-deriving instance Eq T
-
--- Handle is abstract
-deriving instance Eq Handle
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail015.stderr b/testsuite/tests/ghc-regress/deriving/should_fail/drvfail015.stderr
deleted file mode 100644
index a7d8ac6cf1..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail015.stderr
+++ /dev/null
@@ -1,13 +0,0 @@
-
-drvfail015.hs:10:19:
- Illegal instance declaration for `Eq T'
- (All instance types must be of the form (T t1 ... tn)
- where T is not a synonym.
- Use -XTypeSynonymInstances if you want to disable this.)
- In the stand-alone deriving instance for `Eq T'
-
-drvfail015.hs:13:1:
- Can't make a derived instance of `Eq Handle':
- The data constructors of `Handle' are not all in scope
- so you cannot derive an instance for it
- In the stand-alone deriving instance for `Eq Handle'
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail015.stderr-7.0 b/testsuite/tests/ghc-regress/deriving/should_fail/drvfail015.stderr-7.0
deleted file mode 100644
index 9f0166e9cd..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail015.stderr-7.0
+++ /dev/null
@@ -1,12 +0,0 @@
-
-drvfail015.hs:10:19:
- Illegal instance declaration for `Eq T'
- (All instance types must be of the form (T t1 ... tn)
- where T is not a synonym.
- Use -XTypeSynonymInstances if you want to disable this.)
- In the stand-alone deriving instance for `Eq T'
-
-drvfail015.hs:13:1:
- The data constructors of `Handle' are not all in scope
- so you cannot derive an instance for it
- In the stand-alone deriving instance for `Eq Handle'
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail016.hs-boot b/testsuite/tests/ghc-regress/deriving/should_fail/drvfail016.hs-boot
deleted file mode 100644
index b3a388f736..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail016.hs-boot
+++ /dev/null
@@ -1,7 +0,0 @@
-
--- trac #2449
-
-module A where
-
-data D
- deriving Show
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail016.stderr b/testsuite/tests/ghc-regress/deriving/should_fail/drvfail016.stderr
deleted file mode 100644
index 1bcb7363b1..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail016.stderr
+++ /dev/null
@@ -1,4 +0,0 @@
-
-drvfail016.hs-boot:6:1:
- Deriving not permitted in hs-boot file
- Use an instance declaration instead
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail016.stdout b/testsuite/tests/ghc-regress/deriving/should_fail/drvfail016.stdout
deleted file mode 100644
index d00491fd7e..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail016.stdout
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/testsuite/tests/ghc-regress/deriving/should_run/Makefile b/testsuite/tests/ghc-regress/deriving/should_run/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_run/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/deriving/should_run/T2529.hs b/testsuite/tests/ghc-regress/deriving/should_run/T2529.hs
deleted file mode 100644
index d3c3a4b0a3..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_run/T2529.hs
+++ /dev/null
@@ -1,21 +0,0 @@
--- Trac #2529
--- The example below successfully performed the {{{show}}}, but {{{reads}}}
--- returns an empty list. It fails in both GHCi and GHC. It succeeds if you
--- replaces the infix symbol with a name.
-
-module Main where
-
-data A = (:<>:) { x :: Int, y :: Int } deriving (Read, Show)
-
-t :: A
-t = 1 :<>: 2
-
-s :: String
-s = show t
-
-r :: [(A,String)]
-r = reads s
-
-main :: IO ()
-main = do putStrLn s
- putStrLn (show r)
diff --git a/testsuite/tests/ghc-regress/deriving/should_run/T2529.stdout b/testsuite/tests/ghc-regress/deriving/should_run/T2529.stdout
deleted file mode 100644
index 6c5fe6896f..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_run/T2529.stdout
+++ /dev/null
@@ -1,2 +0,0 @@
-(:<>:) {x = 1, y = 2}
-[((:<>:) {x = 1, y = 2},"")]
diff --git a/testsuite/tests/ghc-regress/deriving/should_run/T3087.hs b/testsuite/tests/ghc-regress/deriving/should_run/T3087.hs
deleted file mode 100644
index 7cba3d9609..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_run/T3087.hs
+++ /dev/null
@@ -1,33 +0,0 @@
-{-# LANGUAGE RankNTypes, DeriveDataTypeable #-}
-
-module Main where
-
-import Data.Generics
-
-data MyMaybe a = MyNothing | MyJust a deriving (Data, Typeable)
-
-test1 :: ()
-test1 = undefined `ext1Q` (\ (Just _) -> ()) $ Just ()
-
-test1' :: ()
-test1' = undefined `ext1Q` (\ (MyJust _) -> ()) $ MyJust ()
-
-newtype Q r a = Q { unQ :: a -> r }
-
-ext2Q :: (Data d, Typeable2 t)
- => (d -> q) -> (forall d1 d2. (Data d1, Data d2) => t d1 d2 -> q)
- -> d -> q
-ext2Q def ext arg =
- case dataCast2 (Q ext) of
- Just (Q ext') -> ext' arg
- Nothing -> def arg
-
-data MyPair a b = MyPair a b deriving (Data, Typeable)
-
-test2 :: ()
-test2 = undefined `ext2Q` (\(_,_) -> ()) $ ((),())
-
-test2' :: ()
-test2' = undefined `ext2Q` (\(MyPair _ _) -> ()) $ MyPair () ()
-
-main = do { print test1; print test1'; print test2; print test2' }
diff --git a/testsuite/tests/ghc-regress/deriving/should_run/T3087.stdout b/testsuite/tests/ghc-regress/deriving/should_run/T3087.stdout
deleted file mode 100644
index 35735b4d3b..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_run/T3087.stdout
+++ /dev/null
@@ -1,4 +0,0 @@
-()
-()
-()
-()
diff --git a/testsuite/tests/ghc-regress/deriving/should_run/T4136.hs b/testsuite/tests/ghc-regress/deriving/should_run/T4136.hs
deleted file mode 100644
index d47014bdb0..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_run/T4136.hs
+++ /dev/null
@@ -1,9 +0,0 @@
-module Main where
-
-data T = (:=:) {- | (:!=:) -} deriving (Show,Read)
-
-main
- = do putStrLn ("show (:=:) = " ++ show (:=:))
- putStrLn ("read (show (:=:)) :: T = " ++
- show (read (show (:=:)) :: T))
-
diff --git a/testsuite/tests/ghc-regress/deriving/should_run/T4136.stdout b/testsuite/tests/ghc-regress/deriving/should_run/T4136.stdout
deleted file mode 100644
index 05a108c942..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_run/T4136.stdout
+++ /dev/null
@@ -1,2 +0,0 @@
-show (:=:) = (:=:)
-read (show (:=:)) :: T = (:=:)
diff --git a/testsuite/tests/ghc-regress/deriving/should_run/T4528a.hs b/testsuite/tests/ghc-regress/deriving/should_run/T4528a.hs
deleted file mode 100644
index 85933671c7..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_run/T4528a.hs
+++ /dev/null
@@ -1,7 +0,0 @@
--- Crashed older GHCs when loaded into GHCi
-
-module Main where
-
-data T a = A | B | C deriving( Enum, Show )
-
-main = print [A ..]
diff --git a/testsuite/tests/ghc-regress/deriving/should_run/T4528a.stdout b/testsuite/tests/ghc-regress/deriving/should_run/T4528a.stdout
deleted file mode 100644
index 070375c1da..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_run/T4528a.stdout
+++ /dev/null
@@ -1 +0,0 @@
-[A,B,C]
diff --git a/testsuite/tests/ghc-regress/deriving/should_run/T5041.hs b/testsuite/tests/ghc-regress/deriving/should_run/T5041.hs
deleted file mode 100644
index 4b7ba557dc..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_run/T5041.hs
+++ /dev/null
@@ -1,10 +0,0 @@
-{-# LANGUAGE MagicHash #-}
-
-module Main where
-
-data T = T1# | T2# Int deriving( Read, Show )
-
-foo :: [T]
-foo = read "[ T1#, T2# 4, T2# 5 ]"
-main = print foo
-
diff --git a/testsuite/tests/ghc-regress/deriving/should_run/T5041.stdout b/testsuite/tests/ghc-regress/deriving/should_run/T5041.stdout
deleted file mode 100644
index 7de0b728af..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_run/T5041.stdout
+++ /dev/null
@@ -1 +0,0 @@
-[T1#,T2# 4,T2# 5]
diff --git a/testsuite/tests/ghc-regress/deriving/should_run/all.T b/testsuite/tests/ghc-regress/deriving/should_run/all.T
deleted file mode 100644
index 83e041f296..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_run/all.T
+++ /dev/null
@@ -1,34 +0,0 @@
-# Args to vt are:
-# extra compile flags
-# extra run flags
-# expected process return value, if not zero
-
-test('drvrun001', skip_if_fast, compile_and_run, [''])
-test('drvrun002', skip_if_fast, compile_and_run, [''])
-test('drvrun003', skip_if_fast, compile_and_run, [''])
-test('drvrun004', skip_if_fast, compile_and_run, [''])
-test('drvrun005', skip_if_fast, compile_and_run, [''])
-test('drvrun006', normal, compile_and_run, [''])
-test('drvrun007', skip_if_fast, compile_and_run, [''])
-test('drvrun008', skip_if_fast, compile_and_run, ['-funbox-strict-fields'])
-test('drvrun009', skip_if_fast, compile_and_run, [''])
-test('drvrun010', skip_if_fast, compile_and_run, [''])
-test('drvrun011', skip_if_fast, compile_and_run, [''])
-test('drvrun012', skip_if_fast, compile_and_run, [''])
-test('drvrun013', skip_if_fast, compile_and_run, [''])
-test('drvrun014', skip_if_fast, compile_and_run, [''])
-test('drvrun015', skip_if_fast, compile_and_run, [''])
-test('drvrun016', skip_if_fast, compile_and_run, ['-funbox-strict-fields'])
-test('drvrun017', compose(skip_if_fast, only_compiler_types(['ghc'])), compile_and_run, [''])
-test('drvrun018', skip_if_fast, compile_and_run, [''])
-test('drvrun019', normal, compile_and_run, [''])
-test('drvrun020', normal, compile_and_run, [''])
-test('drvrun021', normal, compile_and_run, [''])
-test('drvrun022', reqlib('syb'), compile_and_run, ['-package syb'])
-test('T3087', reqlib('syb'), compile_and_run, ['-package syb'])
-test('T2529', normal, compile_and_run, [''])
-test('drvrun-functor1', normal, compile_and_run, [''])
-test('drvrun-foldable1', normal, compile_and_run, [''])
-test('T4136', normal, compile_and_run, [''])
-test('T4528a', normal, compile_and_run, [''])
-test('T5041', normal, compile_and_run, [''])
diff --git a/testsuite/tests/ghc-regress/deriving/should_run/drvrun-foldable1.hs b/testsuite/tests/ghc-regress/deriving/should_run/drvrun-foldable1.hs
deleted file mode 100644
index 2db8600389..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_run/drvrun-foldable1.hs
+++ /dev/null
@@ -1,15 +0,0 @@
-{-# LANGUAGE DeriveFunctor, DeriveFoldable #-}
-
-module Main where
-
-import Prelude hiding (sum)
-import Data.Foldable
-
--- Derive Foldable for a simple data type
-
-data List a = Nil | Cons a (List a)
- deriving (Functor,Foldable,Show)
-
-someList = Cons 1 (Cons 1 (Cons 2 (Cons 3 Nil)))
-
-main = print (sum someList)
diff --git a/testsuite/tests/ghc-regress/deriving/should_run/drvrun-foldable1.stdout b/testsuite/tests/ghc-regress/deriving/should_run/drvrun-foldable1.stdout
deleted file mode 100644
index 7f8f011eb7..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_run/drvrun-foldable1.stdout
+++ /dev/null
@@ -1 +0,0 @@
-7
diff --git a/testsuite/tests/ghc-regress/deriving/should_run/drvrun-functor1.hs b/testsuite/tests/ghc-regress/deriving/should_run/drvrun-functor1.hs
deleted file mode 100644
index 1367e360e0..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_run/drvrun-functor1.hs
+++ /dev/null
@@ -1,49 +0,0 @@
-{-# LANGUAGE DeriveFunctor #-}
-
-module Main where
-
--- Derive functor for a simple data type
-
-data List a = Nil | Cons a (List a)
- deriving (Functor,Show)
-
-someList = Cons 1 (Cons 1 (Cons 2 (Cons 3 Nil)))
-doubleList = fmap (*2) someList
-
-test1 = do
- putStr "normal: " >> print someList
- putStr "double: " >> print doubleList
-
--- Derive functor for a data type with functions and tuples
-
-data ReaderWriter r w a = RW { runRW :: r -> (a,w) }
- deriving (Functor)
-
-data Cont r a = Cont { runCont :: (a -> r) -> r }
- deriving (Functor)
-
-test2 = do
- let rw = RW (\r -> ("something",r*3))
- putStr "normal: " >> print (runRW rw 123)
- putStr "reverse: " >> print (runRW (fmap reverse rw) 456)
- let five = Cont ($ 5)
- putStr "normal: " >> runCont five print
- putStr "double: " >> runCont (fmap (*2) five) print
-
--- Derive functor in such a way that we need a constraint
-
-newtype Compose f g a = Compose (f (g a))
- deriving (Functor,Show)
-
-listOfLists = Compose [[1,2,3],[7,8,9]]
-
-test3 = do
- putStr "normal: " >> print listOfLists
- putStr "double: " >> print (fmap (*2) listOfLists)
-
--- All tests
-
-main = do
- test1
- test2
- test3
diff --git a/testsuite/tests/ghc-regress/deriving/should_run/drvrun-functor1.stdout b/testsuite/tests/ghc-regress/deriving/should_run/drvrun-functor1.stdout
deleted file mode 100644
index ba70f8db7a..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_run/drvrun-functor1.stdout
+++ /dev/null
@@ -1,8 +0,0 @@
-normal: Cons 1 (Cons 1 (Cons 2 (Cons 3 Nil)))
-double: Cons 2 (Cons 2 (Cons 4 (Cons 6 Nil)))
-normal: ("something",369)
-reverse: ("gnihtemos",1368)
-normal: 5
-double: 10
-normal: Compose [[1,2,3],[7,8,9]]
-double: Compose [[2,4,6],[14,16,18]]
diff --git a/testsuite/tests/ghc-regress/deriving/should_run/drvrun001.hs b/testsuite/tests/ghc-regress/deriving/should_run/drvrun001.hs
deleted file mode 100644
index b6bd259aa7..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_run/drvrun001.hs
+++ /dev/null
@@ -1,13 +0,0 @@
--- Test newtype derived instances
-
-newtype Age = MkAge Int deriving (Eq, Show)
-
-instance Num Age where
- (+) (MkAge a) (MkAge b) = MkAge (a+b)
- (*) = undefined
- negate = undefined
- abs = undefined
- signum = undefined
- fromInteger = undefined
-
-main = print (MkAge 3 + MkAge 5)
diff --git a/testsuite/tests/ghc-regress/deriving/should_run/drvrun001.stdout b/testsuite/tests/ghc-regress/deriving/should_run/drvrun001.stdout
deleted file mode 100644
index bbfb2f6226..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_run/drvrun001.stdout
+++ /dev/null
@@ -1 +0,0 @@
-MkAge 8
diff --git a/testsuite/tests/ghc-regress/deriving/should_run/drvrun002.hs b/testsuite/tests/ghc-regress/deriving/should_run/drvrun002.hs
deleted file mode 100644
index 26497bd32c..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_run/drvrun002.hs
+++ /dev/null
@@ -1,17 +0,0 @@
--- !!! Deriving Show/Read for type with labelled fields.
--- (based on a Hugs bug report.)
-module Main(main) where
-
-data Options =
- Options { s :: OptionKind }
- deriving (Show, Read)
-
-data OptionKind =
- SpecialOptions { test :: Int }
- deriving (Show, Read)
-
-x = Options{s=SpecialOptions{test=42}}
-
-main = do
- print x
- print ((read (show x))::Options)
diff --git a/testsuite/tests/ghc-regress/deriving/should_run/drvrun002.stdout b/testsuite/tests/ghc-regress/deriving/should_run/drvrun002.stdout
deleted file mode 100644
index 00c70df868..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_run/drvrun002.stdout
+++ /dev/null
@@ -1,2 +0,0 @@
-Options {s = SpecialOptions {test = 42}}
-Options {s = SpecialOptions {test = 42}}
diff --git a/testsuite/tests/ghc-regress/deriving/should_run/drvrun003.hs b/testsuite/tests/ghc-regress/deriving/should_run/drvrun003.hs
deleted file mode 100644
index bb7486159e..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_run/drvrun003.hs
+++ /dev/null
@@ -1,30 +0,0 @@
--- !!! Deriving Show/Read for nullary constructors.
-module Main(main) where
-
-data A = B | C deriving ( Show, Read )
-
-data Opt = N | Y A deriving (Show, Read)
-
-x = Y B
-
-{-
- If the Haskell report's specification of how Show instances
- are to be derived is followed to the letter, the code for
- a nullary constructor would put parens around the constructor
- when (showsPrec 10) is used. This would cause
-
- Y A
-
- to be showed as
-
- Y (A)
-
- Overkill, so ghc's derived Show code treats nullary
- constructors specially.
--}
-
-main = do
- print x
- print ((read (show x))::Opt)
- print ((read "Y (B)")::Opt)
-
diff --git a/testsuite/tests/ghc-regress/deriving/should_run/drvrun003.stdout b/testsuite/tests/ghc-regress/deriving/should_run/drvrun003.stdout
deleted file mode 100644
index 584cfcd5ce..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_run/drvrun003.stdout
+++ /dev/null
@@ -1,3 +0,0 @@
-Y B
-Y B
-Y B
diff --git a/testsuite/tests/ghc-regress/deriving/should_run/drvrun004.hs b/testsuite/tests/ghc-regress/deriving/should_run/drvrun004.hs
deleted file mode 100644
index f530803835..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_run/drvrun004.hs
+++ /dev/null
@@ -1,10 +0,0 @@
-module Main where
-
-data Hash = Hash{ (#) :: Int }
- deriving (Show, Read)
-
-main =
- do print s
- print (read s :: Hash)
- where
- s = show (Hash 3)
diff --git a/testsuite/tests/ghc-regress/deriving/should_run/drvrun004.stdout b/testsuite/tests/ghc-regress/deriving/should_run/drvrun004.stdout
deleted file mode 100644
index c9088b7bd6..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_run/drvrun004.stdout
+++ /dev/null
@@ -1,2 +0,0 @@
-"Hash {(#) = 3}"
-Hash {(#) = 3}
diff --git a/testsuite/tests/ghc-regress/deriving/should_run/drvrun005.hs b/testsuite/tests/ghc-regress/deriving/should_run/drvrun005.hs
deleted file mode 100644
index a4ef060a6a..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_run/drvrun005.hs
+++ /dev/null
@@ -1,27 +0,0 @@
-module Main where
-
-{-
- If a fixity declaration hasn't been supplied for
- an operator, it is defaulted to being "infixl 9".
-
- OLD: The derived Read instances for data types containing
- left-assoc constructors produces code that causes
- non-termination if you use 'read' to evaluate them
- ( (head (reads x)) is cool tho.)
-
- ==> The inferred assoc for :++ below left & the derived
- Read instance should fail to terminate (with ghc-4.xx,
- this is exemplified by having the stack overflow.)
-
- NEW: the new H98 spec says that we ignore associativity when
- parsing, so it terminates fine
--}
--- infixl 9 :++
-data T = T1 | T :++ T deriving (Eq,Show, Read)
-
-t :: T
-t = read "T1"
-
-main = do
- print ((fst (head (reads "T1"))) :: T)
- print t
diff --git a/testsuite/tests/ghc-regress/deriving/should_run/drvrun005.stderr b/testsuite/tests/ghc-regress/deriving/should_run/drvrun005.stderr
deleted file mode 100644
index e69de29bb2..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_run/drvrun005.stderr
+++ /dev/null
diff --git a/testsuite/tests/ghc-regress/deriving/should_run/drvrun005.stdout b/testsuite/tests/ghc-regress/deriving/should_run/drvrun005.stdout
deleted file mode 100644
index c90bc69dcd..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_run/drvrun005.stdout
+++ /dev/null
@@ -1,2 +0,0 @@
-T1
-T1
diff --git a/testsuite/tests/ghc-regress/deriving/should_run/drvrun006.hs b/testsuite/tests/ghc-regress/deriving/should_run/drvrun006.hs
deleted file mode 100644
index 3d268019bd..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_run/drvrun006.hs
+++ /dev/null
@@ -1,49 +0,0 @@
--- !!! Show/Read deriving example given in the Haskell Report.
-module Main(main) where
-
-infix 4 :^:
-data Tree a
- = Leaf a | (Tree a) :^: (Tree a)
- deriving (Show, Read)
-
-val1 :: Tree Int
-val1 = Leaf 2
-
-val2 :: Tree Int
-val2 = Leaf 2 :^: Leaf (-1)
-
-main = do
- print val1
- print val2
-
- print ((read (show val1))::Tree Int)
- print ((read (show val2))::Tree Int)
- print ((read (show val1))::Tree Integer)
- print ((read (show val2))::Tree Integer)
-
-{- What you'll want
-instance (Show a) => Show (Tree a) where
-
- showsPrec d (Leaf m) = showParen (d >= 10) showStr
- where
- showStr = showString "Leaf " . showsPrec 10 m
-
- showsPrec d (u :^: v) = showParen (d > 4) showStr
- where
- showStr = showsPrec 5 u .
- showString " :^: " .
- showsPrec 5 v
-
-instance (Read a) => Read (Tree a) where
-
- readsPrec d r = readParen (d > 4)
- (\r -> [(u:^:v,w) |
- (u,s) <- readsPrec 5 r,
- (":^:",t) <- lex s,
- (v,w) <- readsPrec 5 t]) r
-
- ++ readParen (d > 9)
- (\r -> [(Leaf m,t) |
- ("Leaf",s) <- lex r,
- (m,t) <- readsPrec 10 s]) r
--}
diff --git a/testsuite/tests/ghc-regress/deriving/should_run/drvrun006.stdout b/testsuite/tests/ghc-regress/deriving/should_run/drvrun006.stdout
deleted file mode 100644
index fe1beeeae0..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_run/drvrun006.stdout
+++ /dev/null
@@ -1,6 +0,0 @@
-Leaf 2
-Leaf 2 :^: Leaf (-1)
-Leaf 2
-Leaf 2 :^: Leaf (-1)
-Leaf 2
-Leaf 2 :^: Leaf (-1)
diff --git a/testsuite/tests/ghc-regress/deriving/should_run/drvrun007.hs b/testsuite/tests/ghc-regress/deriving/should_run/drvrun007.hs
deleted file mode 100644
index 5c26c3448d..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_run/drvrun007.hs
+++ /dev/null
@@ -1,6 +0,0 @@
-module Main( main ) where
--- This one crashed Hugs98
-
-data X = X | X :\ X deriving Show
-
-main = putStrLn (show (X :\ X))
diff --git a/testsuite/tests/ghc-regress/deriving/should_run/drvrun007.stdout b/testsuite/tests/ghc-regress/deriving/should_run/drvrun007.stdout
deleted file mode 100644
index fe13f39338..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_run/drvrun007.stdout
+++ /dev/null
@@ -1 +0,0 @@
-X :\ X
diff --git a/testsuite/tests/ghc-regress/deriving/should_run/drvrun008.hs b/testsuite/tests/ghc-regress/deriving/should_run/drvrun008.hs
deleted file mode 100644
index 7fe77992ed..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_run/drvrun008.hs
+++ /dev/null
@@ -1,8 +0,0 @@
--- !!! Check that -funbox-strict-fields doesn't mess up deriving (can't be in an options pragma, it's in the Makefile)
--- !!! (it did in 4.04)
-
-module Main( main ) where
-
-data X = X !Int deriving Eq
-
-main = putStrLn (show (X 2 == X 2))
diff --git a/testsuite/tests/ghc-regress/deriving/should_run/drvrun008.stdout b/testsuite/tests/ghc-regress/deriving/should_run/drvrun008.stdout
deleted file mode 100644
index 0ca95142bb..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_run/drvrun008.stdout
+++ /dev/null
@@ -1 +0,0 @@
-True
diff --git a/testsuite/tests/ghc-regress/deriving/should_run/drvrun009.hs b/testsuite/tests/ghc-regress/deriving/should_run/drvrun009.hs
deleted file mode 100644
index 0bd22ab787..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_run/drvrun009.hs
+++ /dev/null
@@ -1,20 +0,0 @@
--- !!! Check the Read instance for Array
--- [Not strictly a 'deriving' issue]
-
-module Main( main ) where
-import Data.Array
-
-bds :: ((Int,Int),(Int,Int))
-bds = ((1,4),(2,5))
-
-type MyArr = Array (Int,Int) Int
-
-a :: MyArr
-a = array bds [ ((i,j), i+j) | (i,j) <- range bds ]
-
-main = do { putStrLn (show a) ;
- let { b :: MyArr ;
- b = read (show a) } ;
- putStrLn (show b)
- }
-
diff --git a/testsuite/tests/ghc-regress/deriving/should_run/drvrun009.stdout b/testsuite/tests/ghc-regress/deriving/should_run/drvrun009.stdout
deleted file mode 100644
index 2a7d99bd37..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_run/drvrun009.stdout
+++ /dev/null
@@ -1,2 +0,0 @@
-array ((1,4),(2,5)) [((1,4),5),((1,5),6),((2,4),6),((2,5),7)]
-array ((1,4),(2,5)) [((1,4),5),((1,5),6),((2,4),6),((2,5),7)]
diff --git a/testsuite/tests/ghc-regress/deriving/should_run/drvrun010.hs b/testsuite/tests/ghc-regress/deriving/should_run/drvrun010.hs
deleted file mode 100644
index 0a2f3d2742..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_run/drvrun010.hs
+++ /dev/null
@@ -1,12 +0,0 @@
-module Main where
-
-data Test = Test { field :: Int } deriving (Eq,Show,Read)
-
-main = putStrLn $
- if read (show (Test {field=(-1)})) == Test (-1)
- then "works" else "not"
-
--- The point here is that if 'show' generates
--- Test { field=-1 }
--- the lexer things the '=-' is one lexeme, which does not work
-
diff --git a/testsuite/tests/ghc-regress/deriving/should_run/drvrun010.stdout b/testsuite/tests/ghc-regress/deriving/should_run/drvrun010.stdout
deleted file mode 100644
index 153d19401b..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_run/drvrun010.stdout
+++ /dev/null
@@ -1 +0,0 @@
-works
diff --git a/testsuite/tests/ghc-regress/deriving/should_run/drvrun011.hs b/testsuite/tests/ghc-regress/deriving/should_run/drvrun011.hs
deleted file mode 100644
index aad1482f2a..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_run/drvrun011.hs
+++ /dev/null
@@ -1,16 +0,0 @@
--- Tests some simple deriving stuff, and built-in instances
-
-module Main( main ) where
-
-data Command = Commit (Maybe String) | Foo | Baz Bool | Boz Int
- deriving (Read,Show)
-
-type T = ([Command], [Command], [Command])
-val :: T
-val = ([Commit Nothing, Commit (Just "foo")],
- [Foo, Baz True],
- [Boz 3, Boz (-2)])
-
-main = do { print val ;
- print ((read (show val)) :: T) }
-
diff --git a/testsuite/tests/ghc-regress/deriving/should_run/drvrun011.stdout b/testsuite/tests/ghc-regress/deriving/should_run/drvrun011.stdout
deleted file mode 100644
index 0ddc486aad..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_run/drvrun011.stdout
+++ /dev/null
@@ -1,2 +0,0 @@
-([Commit Nothing,Commit (Just "foo")],[Foo,Baz True],[Boz 3,Boz (-2)])
-([Commit Nothing,Commit (Just "foo")],[Foo,Baz True],[Boz 3,Boz (-2)])
diff --git a/testsuite/tests/ghc-regress/deriving/should_run/drvrun012.hs b/testsuite/tests/ghc-regress/deriving/should_run/drvrun012.hs
deleted file mode 100644
index 3775a3b958..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_run/drvrun012.hs
+++ /dev/null
@@ -1,11 +0,0 @@
--- Tests readings of record syntax
-
-module Main where
-
-data Foo = Foo { x :: Baz, y :: Maybe Int } deriving (Read,Show)
-
-infix 0 :%%
-data Baz = Int :%% Int deriving( Read,Show)
-
-
-main = print (read "Foo { x = 1 :%% 2, y = Just 4 }" :: Foo)
diff --git a/testsuite/tests/ghc-regress/deriving/should_run/drvrun012.stdout b/testsuite/tests/ghc-regress/deriving/should_run/drvrun012.stdout
deleted file mode 100644
index dbef9bc870..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_run/drvrun012.stdout
+++ /dev/null
@@ -1 +0,0 @@
-Foo {x = 1 :%% 2, y = Just 4}
diff --git a/testsuite/tests/ghc-regress/deriving/should_run/drvrun013.hs b/testsuite/tests/ghc-regress/deriving/should_run/drvrun013.hs
deleted file mode 100644
index 2a9adae585..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_run/drvrun013.hs
+++ /dev/null
@@ -1,19 +0,0 @@
--- This test makes sure that the derivied instance for
--- Eq A
--- "sees" the non-derived instance for
--- Eq B
---
--- In a version of GHC 5.05, this didn't happen, because the
--- deriving mechanism looked through A's rep-type and found Int
-
-module Main where
-
-newtype B = MkB Int
-instance Eq B where
- (MkB 1) == (MkB 2) = True -- Non-standard equality
- (MkB a) == (MkB b) = False
-
-newtype A = MkA B deriving( Eq )
-
-main = print (MkA (MkB 1) == MkA (MkB 2))
--- Should say "True", because of B's non-standard instance
diff --git a/testsuite/tests/ghc-regress/deriving/should_run/drvrun013.stdout b/testsuite/tests/ghc-regress/deriving/should_run/drvrun013.stdout
deleted file mode 100644
index 0ca95142bb..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_run/drvrun013.stdout
+++ /dev/null
@@ -1 +0,0 @@
-True
diff --git a/testsuite/tests/ghc-regress/deriving/should_run/drvrun014.hs b/testsuite/tests/ghc-regress/deriving/should_run/drvrun014.hs
deleted file mode 100644
index 806af8ce1c..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_run/drvrun014.hs
+++ /dev/null
@@ -1,19 +0,0 @@
--- This one gave the wrong answer with ghci 5.02.3 (and 5.02.2)
-
-module Main where
-
-infixr 3 :*
-infixr 2 :+
-
-data RE a = RE a :+ RE a
- | RE a :* RE a
- | Cat [RE a]
- | Star (RE a)
- | Plus (RE a)
- | Opt (RE a)
- | Comp (RE a)
- | Empty
- | Str [a]
- deriving (Show, Eq, Ord)
-
-main = print (Str "ab" == (Str "a" :+ Str "b"))
diff --git a/testsuite/tests/ghc-regress/deriving/should_run/drvrun014.stdout b/testsuite/tests/ghc-regress/deriving/should_run/drvrun014.stdout
deleted file mode 100644
index bc59c12aa1..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_run/drvrun014.stdout
+++ /dev/null
@@ -1 +0,0 @@
-False
diff --git a/testsuite/tests/ghc-regress/deriving/should_run/drvrun015.hs b/testsuite/tests/ghc-regress/deriving/should_run/drvrun015.hs
deleted file mode 100644
index b6e10394fa..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_run/drvrun015.hs
+++ /dev/null
@@ -1,8 +0,0 @@
--- The leading underscore killed GHC 5.04
-
-module Main where
-
-data Obj = Obj {_id, p1, p2::Int} deriving (Show, Read)
-
-
-main = print (show (read "Obj {_id=1,p1=10,p2=20}" :: Obj))
diff --git a/testsuite/tests/ghc-regress/deriving/should_run/drvrun015.stdout b/testsuite/tests/ghc-regress/deriving/should_run/drvrun015.stdout
deleted file mode 100644
index d7059cd3ff..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_run/drvrun015.stdout
+++ /dev/null
@@ -1 +0,0 @@
-"Obj {_id = 1, p1 = 10, p2 = 20}"
diff --git a/testsuite/tests/ghc-regress/deriving/should_run/drvrun016.hs b/testsuite/tests/ghc-regress/deriving/should_run/drvrun016.hs
deleted file mode 100644
index 1d6de577ac..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_run/drvrun016.hs
+++ /dev/null
@@ -1,18 +0,0 @@
--- Run with -funbox-strict-fields
--- Bug in GHC 5.04.3
-
-module Main where
-
-data Foo = Foo Int String
-data Bar = Bar Int Foo
-
-instance Ord Bar where
- compare (Bar i _) (Bar j _) = compare i j
-
-instance Eq Bar where
- (Bar i _) == (Bar j _) = i == j
-
-
-data Zot = Zot !Bar !String deriving (Ord,Eq)
-
-main = putStrLn "Success"
diff --git a/testsuite/tests/ghc-regress/deriving/should_run/drvrun016.stdout b/testsuite/tests/ghc-regress/deriving/should_run/drvrun016.stdout
deleted file mode 100644
index 35821117c8..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_run/drvrun016.stdout
+++ /dev/null
@@ -1 +0,0 @@
-Success
diff --git a/testsuite/tests/ghc-regress/deriving/should_run/drvrun017.hs b/testsuite/tests/ghc-regress/deriving/should_run/drvrun017.hs
deleted file mode 100644
index e14619c1a9..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_run/drvrun017.hs
+++ /dev/null
@@ -1,10 +0,0 @@
-{-# LANGUAGE MagicHash #-}
-
--- Test Show on unboxed types
-
-module Main where
-import GHC.Base
-
-data Foo = MkFoo Int# Float# Int deriving( Show )
-
-main = print (MkFoo 3# 4.3# 2) \ No newline at end of file
diff --git a/testsuite/tests/ghc-regress/deriving/should_run/drvrun017.stdout b/testsuite/tests/ghc-regress/deriving/should_run/drvrun017.stdout
deleted file mode 100644
index 6f1bd8c7fa..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_run/drvrun017.stdout
+++ /dev/null
@@ -1 +0,0 @@
-MkFoo 3 4.3 2
diff --git a/testsuite/tests/ghc-regress/deriving/should_run/drvrun018.hs b/testsuite/tests/ghc-regress/deriving/should_run/drvrun018.hs
deleted file mode 100644
index a0b9f24362..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_run/drvrun018.hs
+++ /dev/null
@@ -1,9 +0,0 @@
-
--- Test Show on unboxed types
-
-module Main where
-
-data Foo = Int `MkFoo` Int deriving( Read, Show )
-
-main = do { print (MkFoo 4 5)
- ; print (read "3 `MkFoo` 5" :: Foo) }
diff --git a/testsuite/tests/ghc-regress/deriving/should_run/drvrun018.stdout b/testsuite/tests/ghc-regress/deriving/should_run/drvrun018.stdout
deleted file mode 100644
index 5393fc4654..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_run/drvrun018.stdout
+++ /dev/null
@@ -1,2 +0,0 @@
-4 `MkFoo` 5
-3 `MkFoo` 5
diff --git a/testsuite/tests/ghc-regress/deriving/should_run/drvrun019.hs b/testsuite/tests/ghc-regress/deriving/should_run/drvrun019.hs
deleted file mode 100644
index 3fd8ccf025..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_run/drvrun019.hs
+++ /dev/null
@@ -1,15 +0,0 @@
-{-# LANGUAGE GeneralizedNewtypeDeriving #-}
-
--- Tests newtype deriving with
--- a non-type constructor in the representation
-
-module Main where
-
-newtype Wrap m a = Wrap { unWrap :: m a }
- deriving (Monad, Eq)
-
-foo :: Int -> Wrap IO a -> Wrap IO ()
-foo 0 a = return ()
-foo n a = do { a; foo (n-1) a }
-
-main = do { unWrap (foo 3 (Wrap (putChar 'x'))); putChar '\n' }
diff --git a/testsuite/tests/ghc-regress/deriving/should_run/drvrun019.stdout b/testsuite/tests/ghc-regress/deriving/should_run/drvrun019.stdout
deleted file mode 100644
index f165e2102f..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_run/drvrun019.stdout
+++ /dev/null
@@ -1 +0,0 @@
-xxx
diff --git a/testsuite/tests/ghc-regress/deriving/should_run/drvrun020.hs b/testsuite/tests/ghc-regress/deriving/should_run/drvrun020.hs
deleted file mode 100644
index cf78a2a992..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_run/drvrun020.hs
+++ /dev/null
@@ -1,46 +0,0 @@
--- A nasty deriving test
--- Note the "T2 T1 { f1=3 }" part!
-
-module Main where
-
-
-infix 4 :%%
-data T = Int :%% T
- | T1 { f1 :: Int }
- | T2 T
- deriving( Show, Read )
-
-main = print (read "3 :%% T2 T1 { f1=3 }" :: T)
-
-{- Here's the parser that is produced
-
-import GHC.Read
-import Text.ParserCombinators.ReadPrec
-import Text.Read
-
-instance Read T where
- readPrec =
- parens
- ( prec 4 (
- do x <- step readPrec
- Symbol ":%%" <- lexP
- y <- step readPrec
- return (x :%% y))
- +++
- prec (appPrec+1) (
- do Ident "T1" <- lexP
- Punc "{" <- lexP
- Ident "f1" <- lexP
- Punc "=" <- lexP
- x <- reset readPrec
- Punc "}" <- lexP
- return (T1 { f1 = x }))
- +++
- prec appPrec (
- do Ident "T2" <- lexP
- x <- step readPrec
- return (T2 x))
- )
-
-appPrec = 10::Int
--}
diff --git a/testsuite/tests/ghc-regress/deriving/should_run/drvrun020.stdout b/testsuite/tests/ghc-regress/deriving/should_run/drvrun020.stdout
deleted file mode 100644
index bb33aca722..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_run/drvrun020.stdout
+++ /dev/null
@@ -1 +0,0 @@
-3 :%% T2 (T1 {f1 = 3})
diff --git a/testsuite/tests/ghc-regress/deriving/should_run/drvrun021.hs b/testsuite/tests/ghc-regress/deriving/should_run/drvrun021.hs
deleted file mode 100644
index 05c7c8dbf0..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_run/drvrun021.hs
+++ /dev/null
@@ -1,20 +0,0 @@
-module Main where
-
-class Show a => Foo a where
- op :: a -> a
-
-newtype Moose = MkMoose () deriving (Show, Eq, Ord)
-
-newtype Noose = MkNoose () deriving (Ord)
-
-instance Eq Noose where
- a == b = False -- Non-standard!
-
-f :: Ord a => a -> Bool
-f x = x==x
-
-main = do print (MkNoose () == MkNoose ()) -- Eq Noose
- print (f (MkNoose ())) -- via Ord Noose
- print (MkMoose () == MkMoose ()) -- Eq Moose
- print (f (MkMoose ())) -- via Ord Moose
- putStrLn (show (MkMoose ())) -- Should not use the show () method
diff --git a/testsuite/tests/ghc-regress/deriving/should_run/drvrun021.stdout b/testsuite/tests/ghc-regress/deriving/should_run/drvrun021.stdout
deleted file mode 100644
index ae2b8d6354..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_run/drvrun021.stdout
+++ /dev/null
@@ -1,5 +0,0 @@
-False
-False
-True
-True
-MkMoose ()
diff --git a/testsuite/tests/ghc-regress/deriving/should_run/drvrun022.hs b/testsuite/tests/ghc-regress/deriving/should_run/drvrun022.hs
deleted file mode 100644
index fe95c3323b..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_run/drvrun022.hs
+++ /dev/null
@@ -1,12 +0,0 @@
-{-# LANGUAGE DeriveDataTypeable #-}
-
-module Main where
-
--- GHC 6.4.1 output "testz" in z-encoded form!
-
-import Data.Generics
-
-data TestZ = TestZ { testz :: Int }
- deriving (Show, Read, Eq, Data, Typeable)
-
-main = print $ constrFields . toConstr $ TestZ { testz = 2 }
diff --git a/testsuite/tests/ghc-regress/deriving/should_run/drvrun022.stdout b/testsuite/tests/ghc-regress/deriving/should_run/drvrun022.stdout
deleted file mode 100644
index e0ea368f1a..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_run/drvrun022.stdout
+++ /dev/null
@@ -1 +0,0 @@
-["testz"]