[commit: testsuite] master: Fix test for Trac #7931 (f35851f)

Simon Peyton Jones simonpj at microsoft.com
Thu May 30 16:19:56 CEST 2013


Repository : ssh://darcs.haskell.org//srv/darcs/testsuite

On branch  : master

https://github.com/ghc/testsuite/commit/f35851fc7ef68a9fc7fc15227b0465a9ce98791a

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

commit f35851fc7ef68a9fc7fc15227b0465a9ce98791a
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Thu May 30 15:19:11 2013 +0100

    Fix test for Trac #7931

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

 tests/deriving/should_run/T7931.hs                 |    5 ++++-
 tests/deriving/should_run/T7931.stderr             |    1 -
 .../should_run/T7931.stdout}                       |    0 
 tests/deriving/should_run/all.T                    |    2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/tests/deriving/should_run/T7931.hs b/tests/deriving/should_run/T7931.hs
index 052b682..c97d648 100644
--- a/tests/deriving/should_run/T7931.hs
+++ b/tests/deriving/should_run/T7931.hs
@@ -3,5 +3,8 @@ module Main where
  
 data A 
 deriving instance Read A 
+deriving instance Show A 
+ 
+main = print (read "[]" :: [A])
+-- Should successfully read the empty list
  
-main = seq (read "" :: A) (return ()) 
diff --git a/tests/deriving/should_run/T7931.stderr b/tests/deriving/should_run/T7931.stderr
deleted file mode 100644
index 74be9c9..0000000
--- a/tests/deriving/should_run/T7931.stderr
+++ /dev/null
@@ -1 +0,0 @@
-T7931: Derived Read on empty data type
diff --git a/tests/codeGen/should_run/cgrun058.stdout b/tests/deriving/should_run/T7931.stdout
similarity index 100%
copy from tests/codeGen/should_run/cgrun058.stdout
copy to tests/deriving/should_run/T7931.stdout
diff --git a/tests/deriving/should_run/all.T b/tests/deriving/should_run/all.T
index cfef4c3..a2763ac 100644
--- a/tests/deriving/should_run/all.T
+++ b/tests/deriving/should_run/all.T
@@ -34,5 +34,5 @@ test('T4528a', normal, compile_and_run, [''])
 test('T5041', normal, compile_and_run, [''])
 test('T5628', exit_code(1), compile_and_run, [''])
 test('T5712', normal, compile_and_run, [''])
-test('T7931', exit_code(1), compile_and_run, [''])
+test('T7931', normal, compile_and_run, [''])
 





More information about the ghc-commits mailing list