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

testsuite/tests/deriving/should_compile/AutoDeriveTypeable.hs

+{-# LANGUAGE AutoDeriveTypeable #-}
+{-# LANGUAGE StandaloneDeriving #-}
+
+module AutoDeriveTypeable where
+
+import Data.Typeable
+
+
+data A = A
+
+data B = B deriving Typeable
+
+data C = C
+deriving instance Typeable C
+
+test = [typeRep [A], typeRep [B], typeRep [C]]

testsuite/tests/deriving/should_compile/T7704.hs

+{-# LANGUAGE PolyKinds          #-}
+{-# LANGUAGE DeriveDataTypeable #-}
+{-# LANGUAGE StandaloneDeriving #-}
+
+module T7704 where
+
+import Data.Typeable
+
+data A1 = A1 deriving Typeable
+data A2 = A2
+deriving instance Typeable A2
+
+data B1 a = B1 deriving Typeable
+data B2 a = B2
+deriving instance Typeable B2
+
+data C1 a = C1 deriving Typeable
+data C2 a = C2
+deriving instance Typeable C2
+
+data D1 f = D1 (f (D1 f)) deriving Typeable
+data D2 f = D2 (f (D2 f))
+deriving instance Typeable D2
+
+data E1 (a :: k) f = E1 (f Int) deriving Typeable
+data E2 (a :: k) f = E2 (f Int)
+deriving instance Typeable E2

testsuite/tests/deriving/should_compile/all.T

@@ -36,4 +36,7 @@ test('T1133',
      extra_clean(['T1133.o-boot', 'T1133.hi-boot']),
      run_command,
      ['$MAKE --no-print-directory -s T1133'])
-test('T7710', normal, compile, [''])
\ No newline at end of file
+test('T7704', normal, compile, [''])
+test('T7710', normal, compile, [''])
+
+test('AutoDeriveTypeable', normal, compile, [''])
\ No newline at end of file

testsuite/tests/deriving/should_fail/T2604.stderr

 
 T2604.hs:7:35:
-    Can't make a derived instance of ‛Typeable * (DList a)’:
+    Can't make a derived instance of ‛Typeable * DList’:
       You need -XDeriveDataTypeable to derive an instance for this class
     In the data declaration for ‛DList’
 
 T2604.hs:9:38:
-    Can't make a derived instance of ‛Typeable * (NList a)’:
+    Can't make a derived instance of ‛Typeable * NList’:
       You need -XDeriveDataTypeable to derive an instance for this class
     In the newtype declaration for ‛NList’

testsuite/tests/plugins/Makefile

@@ -5,6 +5,6 @@ include $(TOP)/mk/test.mk
 .PHONY: plugins01
 
 plugins01:
-	"$(TEST_HC)" $(HC_OPTS) --make -v0 plugins01.hs -package-db simple-plugin/pkg.plugins01/local.package.conf -fplugin Simple.Plugin -fplugin-opt Simple.Plugin:Irrelevant_Option -package simple-plugin
+	"$(TEST_HC)" $(TEST_HC_OPTS) --make -v0 plugins01.hs -package-db simple-plugin/pkg.plugins01/local.package.conf -fplugin Simple.Plugin -fplugin-opt Simple.Plugin:Irrelevant_Option -package simple-plugin
 	./plugins01