[commit: testsuite] master: Wibbles for new UNPACK stuff (46e0cc5)

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/46e0cc50edfff44d816811ec75925ecfe3e6599b

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

commit 46e0cc50edfff44d816811ec75925ecfe3e6599b
Author: Simon Peyton Jones <[email protected]>
Date:   Wed Dec 19 17:26:07 2012 +0000

    Wibbles for new UNPACK stuff

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

 tests/rename/should_fail/rnfail055.stderr          |    2 +-
 .../should_compile/UnboxStrictPrimitiveFields.hs   |    2 +-
 tests/typecheck/should_compile/all.T               |    2 +-
 tests/typecheck/should_fail/all.T                  |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/rename/should_fail/rnfail055.stderr b/tests/rename/should_fail/rnfail055.stderr
index 45e0965..c87349d 100644
--- a/tests/rename/should_fail/rnfail055.stderr
+++ b/tests/rename/should_fail/rnfail055.stderr
@@ -75,7 +75,7 @@ RnFail055.hs-boot:23:6:
     Boot file:   data T6
                      No C type associated
                      RecFlag NonRecursive
-                     = T6 :: Int -> T6 HasWrapper Stricts: !
+                     = T6 :: Int -> T6 HasWrapper Stricts: SrictNotUnpacked
                      FamilyInstance: none
 
 RnFail055.hs-boot:25:6:
diff --git a/tests/typecheck/should_compile/UnboxStrictPrimitiveFields.hs b/tests/typecheck/should_compile/UnboxStrictPrimitiveFields.hs
index e1549bd..f814db9 100644
--- a/tests/typecheck/should_compile/UnboxStrictPrimitiveFields.hs
+++ b/tests/typecheck/should_compile/UnboxStrictPrimitiveFields.hs
@@ -1,5 +1,5 @@
 {-# LANGUAGE MagicHash #-}
-{-# OPTIONS_GHC -funbox-strict-primitive-fields #-}
+{-# OPTIONS_GHC -funbox-small-strict-fields #-}
 module Test where
 
 import GHC.Exts
diff --git a/tests/typecheck/should_compile/all.T b/tests/typecheck/should_compile/all.T
index cb24574..5905bb7 100644
--- a/tests/typecheck/should_compile/all.T
+++ b/tests/typecheck/should_compile/all.T
@@ -386,7 +386,7 @@ test('T7171',normal,run_command,
      ['$MAKE -s --no-print-directory T7171'])
 test('T7173', normal, compile, [''])
 test('T7196', normal, compile, [''])
-test('T7050', normal, compile, [''])
+test('T7050', normal, compile, ['-O'])
 test('T7312', normal, compile, [''])
 test('T7384', normal, compile, [''])
 test('T7451', normal, compile, [''])
diff --git a/tests/typecheck/should_fail/all.T b/tests/typecheck/should_fail/all.T
index 9704f18..2e1ec6e 100644
--- a/tests/typecheck/should_fail/all.T
+++ b/tests/typecheck/should_fail/all.T
@@ -214,7 +214,7 @@ test('T3102', normal, compile_fail, [''])
 test('T3613', normal, compile_fail, [''])
 test('fd-loop', normal, compile_fail, [''])
 test('T3950', normal, compile_fail, [''])
-test('T3966', normal, compile_fail, [''])
+test('T3966', normal, compile_fail, ['-O'])
 test('IPFail', normal, compile_fail, [''])
 
 test('T3468', extra_clean(['T3468.hi-boot', 'T3468.o-boot']),