Repository : ssh://darcs.haskell.org//srv/darcs/testsuite On branch : master
http://hackage.haskell.org/trac/ghc/changeset/8f3d6a513ebba2c0a1fb15f835af78ad9e0023ff >--------------------------------------------------------------- commit 8f3d6a513ebba2c0a1fb15f835af78ad9e0023ff Author: Paolo Capriotti <[email protected]> Date: Thu Jul 5 20:04:37 2012 +0100 Fix test case for #4138. As per the comments on that ticket, *not* inlining rnf is correct, so make this test pass. >--------------------------------------------------------------- tests/simplCore/should_compile/T4138.hs | 8 ++++---- tests/simplCore/should_compile/T4138.stdout | 2 +- tests/simplCore/should_compile/all.T | 3 +-- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/tests/simplCore/should_compile/T4138.hs b/tests/simplCore/should_compile/T4138.hs index 211c607..b0d4cef 100644 --- a/tests/simplCore/should_compile/T4138.hs +++ b/tests/simplCore/should_compile/T4138.hs @@ -13,8 +13,8 @@ f = rnf {- We're hoping that the output will include something like: - \ (ds_dvm :: (GHC.Types.Float, GHC.Types.Float)) -> - case ds_dvm of _ { (x_aux, y_auy) -> - case x_aux of _ { GHC.Types.F# ipv_svw -> - case y_auy of _ { GHC.Types.F# ipv_svx -> GHC.Unit.() } } } + \ (ds_afa :: (GHC.Types.Float, GHC.Types.Float)) -> + case ds_afa of _ { (x_afd, y_afe) -> + case x_afd of _ { GHC.Types.F# ipv_afm -> + T4138_A.$fNFDataFloat_$crnf y_afe } } -} diff --git a/tests/simplCore/should_compile/T4138.stdout b/tests/simplCore/should_compile/T4138.stdout index 0cfbf08..d00491f 100644 --- a/tests/simplCore/should_compile/T4138.stdout +++ b/tests/simplCore/should_compile/T4138.stdout @@ -1 +1 @@ -2 +1 diff --git a/tests/simplCore/should_compile/all.T b/tests/simplCore/should_compile/all.T index 3104ef2..38b5730 100644 --- a/tests/simplCore/should_compile/all.T +++ b/tests/simplCore/should_compile/all.T @@ -144,7 +144,6 @@ test('T5776', run_command, ['$MAKE -s --no-print-directory T5776']) test('T4138', - [extra_clean(['T4138_A.hi', 'T4138_A.o', 'T4138.simpl']), - expect_broken(4138)], + extra_clean(['T4138_A.hi', 'T4138_A.o', 'T4138.simpl']), run_command, ['$MAKE -s --no-print-directory T4138']) _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
