summaryrefslogtreecommitdiff
path: root/testsuite
diff options
context:
space:
mode:
authorThomas Miedema <thomasmiedema@gmail.com>2015-02-23 03:40:58 -0600
committerAustin Seipp <austin@well-typed.com>2015-02-23 03:40:58 -0600
commit47175e06ff8364c732607e3d76ef3b7b80d57f1c (patch)
tree3cc25b0ce8c6d5b2b7a6f3ebf8cd87a55bb5d9a7 /testsuite
parenta293925d810229fbea77d95f2b3068e78f8380cc (diff)
downloadhaskell-47175e06ff8364c732607e3d76ef3b7b80d57f1c.tar.gz
Show '#' on unboxed literals
Test Plan: deriving/should_run/T10104 Reviewers: austin, jstolarek Reviewed By: austin, jstolarek Subscribers: thomie Differential Revision: https://phabricator.haskell.org/D672 GHC Trac Issues: #10104
Diffstat (limited to 'testsuite')
-rw-r--r--testsuite/.gitignore2
-rw-r--r--testsuite/tests/deriving/should_run/T10104.hs11
-rw-r--r--testsuite/tests/deriving/should_run/T10104.stdout2
-rw-r--r--testsuite/tests/deriving/should_run/T8280.hs8
-rw-r--r--testsuite/tests/deriving/should_run/T8280.stdout1
-rw-r--r--testsuite/tests/deriving/should_run/all.T3
6 files changed, 16 insertions, 11 deletions
diff --git a/testsuite/.gitignore b/testsuite/.gitignore
index ef3c86143b..362c5a1db5 100644
--- a/testsuite/.gitignore
+++ b/testsuite/.gitignore
@@ -419,7 +419,7 @@ mk/ghcconfig*_inplace_bin_ghc-stage2.exe.mk
/tests/deriving/should_run/T5628
/tests/deriving/should_run/T5712
/tests/deriving/should_run/T7931
-/tests/deriving/should_run/T8280
+/tests/deriving/should_run/T10104
/tests/deriving/should_run/drvrun-foldable1
/tests/deriving/should_run/drvrun-functor1
/tests/deriving/should_run/drvrun001
diff --git a/testsuite/tests/deriving/should_run/T10104.hs b/testsuite/tests/deriving/should_run/T10104.hs
new file mode 100644
index 0000000000..154a6097f7
--- /dev/null
+++ b/testsuite/tests/deriving/should_run/T10104.hs
@@ -0,0 +1,11 @@
+{-# LANGUAGE MagicHash #-}
+module Main where
+
+import GHC.Prim
+
+data P = Positives Int# Float# Double# Char# Word# deriving Show
+data N = Negatives Int# Float# Double# deriving Show
+
+main = do
+ print $ Positives 42# 4.23# 4.23## '4'# 4##
+ print $ Negatives -4# -4.0# -4.0##
diff --git a/testsuite/tests/deriving/should_run/T10104.stdout b/testsuite/tests/deriving/should_run/T10104.stdout
new file mode 100644
index 0000000000..3213680109
--- /dev/null
+++ b/testsuite/tests/deriving/should_run/T10104.stdout
@@ -0,0 +1,2 @@
+Positives 42# 4.23# 4.23## '4'# 4##
+Negatives -4# -4.0# -4.0##
diff --git a/testsuite/tests/deriving/should_run/T8280.hs b/testsuite/tests/deriving/should_run/T8280.hs
deleted file mode 100644
index 4ccc5b4164..0000000000
--- a/testsuite/tests/deriving/should_run/T8280.hs
+++ /dev/null
@@ -1,8 +0,0 @@
-{-# LANGUAGE MagicHash #-}
-module Main where
-
-import GHC.Prim
-
-data A = A Word# deriving Show
-
-main = print (A (int2Word# 4#))
diff --git a/testsuite/tests/deriving/should_run/T8280.stdout b/testsuite/tests/deriving/should_run/T8280.stdout
deleted file mode 100644
index 4e5c0aa287..0000000000
--- a/testsuite/tests/deriving/should_run/T8280.stdout
+++ /dev/null
@@ -1 +0,0 @@
-A 4
diff --git a/testsuite/tests/deriving/should_run/all.T b/testsuite/tests/deriving/should_run/all.T
index 13858a85c2..00856a6a86 100644
--- a/testsuite/tests/deriving/should_run/all.T
+++ b/testsuite/tests/deriving/should_run/all.T
@@ -35,6 +35,7 @@ test('T5041', normal, compile_and_run, [''])
test('T5628', exit_code(1), compile_and_run, [''])
test('T5712', normal, compile_and_run, [''])
test('T7931', normal, compile_and_run, [''])
-test('T8280', normal, compile_and_run, [''])
+# T8280 is superseded by T10104
test('T9576', exit_code(1), compile_and_run, [''])
test('T9830', extra_clean(['T9830a.hi', 'T9830a.o']), multimod_compile_and_run, ['T9830','-v0'])
+test('T10104', normal, compile_and_run, [''])