Merge branch 'master' of http://darcs.haskell.org//testsuite
authorSimon Peyton Jones <simonpj@microsoft.com>
Wed, 3 Oct 2012 07:49:18 +0000 (08:49 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Wed, 3 Oct 2012 07:49:18 +0000 (08:49 +0100)
Conflicts:
tests/polykinds/all.T

testsuite/tests/polykinds/T7272.hs [new file with mode: 0644]
testsuite/tests/polykinds/T7272.hs-boot [new file with mode: 0644]
testsuite/tests/polykinds/T7272a.hs [new file with mode: 0644]
testsuite/tests/polykinds/all.T
testsuite/tests/simplCore/should_compile/T7287.hs [new file with mode: 0644]
testsuite/tests/simplCore/should_compile/all.T

diff --git a/testsuite/tests/polykinds/T7272.hs b/testsuite/tests/polykinds/T7272.hs
new file mode 100644 (file)
index 0000000..7589662
--- /dev/null
@@ -0,0 +1,7 @@
+{-# LANGUAGE PolyKinds #-}\r
+\r
+module T7272 where\r
+\r
+import T7272a\r
+\r
+class C (a :: k)\r
diff --git a/testsuite/tests/polykinds/T7272.hs-boot b/testsuite/tests/polykinds/T7272.hs-boot
new file mode 100644 (file)
index 0000000..fa46e1e
--- /dev/null
@@ -0,0 +1,5 @@
+{-# LANGUAGE PolyKinds #-}\r
+\r
+module T7272 where\r
+\r
+class C (a :: k)\r
diff --git a/testsuite/tests/polykinds/T7272a.hs b/testsuite/tests/polykinds/T7272a.hs
new file mode 100644 (file)
index 0000000..3fe7677
--- /dev/null
@@ -0,0 +1,5 @@
+{-# LANGUAGE PolyKinds #-}\r
+\r
+module T7272a where\r
+\r
+import {-# SOURCE #-} T7272\r
index dc9ab14..7e50bb5 100644 (file)
@@ -63,10 +63,12 @@ test('T7128', normal, compile,[''])
 test('T7151', normal, compile_fail,[''])
 test('T7095', normal, compile,[''])
 test('T7090', normal, compile,[''])
+test('T7272',
+     extra_clean(['T7272a.hi', 'T7272a.o']),
+     multimod_compile,
+     ['T7272.hs', '-v0'])
 test('T7176', normal, compile,[''])
 test('T7224', normal, compile_fail,[''])
 test('T7230', normal, compile_fail,[''])
 test('T7238', normal, compile,[''])
 test('T7278', normal, compile_fail,[''])
-
-
diff --git a/testsuite/tests/simplCore/should_compile/T7287.hs b/testsuite/tests/simplCore/should_compile/T7287.hs
new file mode 100644 (file)
index 0000000..1d777bd
--- /dev/null
@@ -0,0 +1,8 @@
+{-# LANGUAGE MagicHash #-}\r
+module T7287 where\r
+\r
+import GHC.Prim\r
+\r
+{-# RULES\r
+  "int2Word#/word2Int#" forall x. int2Word# (word2Int# x) = x\r
+  #-}\r
index 973342a..e9b9aa3 100644 (file)
@@ -153,4 +153,5 @@ test('T7165',
      extra_clean(['T7165a.hi', 'T7165a.o']),
      run_command,
      ['$MAKE -s --no-print-directory T7165'])
+test('T7287', normal, compile, [''])