[commit: testsuite] master: Fix dph-words. sliceP no wants its second argument to be the slice length. (6900c19)

Ben Lippmeier benl at ouroborus.net
Fri Jun 24 05:52:54 CEST 2011


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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/6900c19dda729d22270f1831da9e351671a19bae

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

commit 6900c19dda729d22270f1831da9e351671a19bae
Author: Ben Lippmeier <benl at ouroborus.net>
Date:   Fri Jun 24 13:50:27 2011 +1000

    Fix dph-words. sliceP no wants its second argument to be the slice length.
    
    from George.

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

 tests/ghc-regress/dph/words/WordsVect.hs |    4 ++--
 tests/ghc-regress/dph/words/dph-words.T  |    3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/tests/ghc-regress/dph/words/WordsVect.hs b/tests/ghc-regress/dph/words/WordsVect.hs
index 43880fd..abf416e 100644
--- a/tests/ghc-regress/dph/words/WordsVect.hs
+++ b/tests/ghc-regress/dph/words/WordsVect.hs
@@ -71,8 +71,8 @@ stateOfString str
 	 | len == 1	= stateOfChar (str !: 0)
 	 | otherwise	
 	 =  let	half	= len `div` 2
-		s1	= sliceP 0    half str
-		s2	= sliceP half len  str
+		s1	= sliceP 0    half       str
+		s2	= sliceP half (len-half) str
 	    in	plusState (stateOfString s1) (stateOfString s2)
     in	result
 
diff --git a/tests/ghc-regress/dph/words/dph-words.T b/tests/ghc-regress/dph/words/dph-words.T
index 9d40d1d..c89d01b 100644
--- a/tests/ghc-regress/dph/words/dph-words.T
+++ b/tests/ghc-regress/dph/words/dph-words.T
@@ -7,13 +7,12 @@ test    ('dph-words-opt'
           , only_ways(['normal']) ] 
         , multimod_compile_and_run 
         , [ 'Main'
-          , '-Odph -fdph-par'])
+          , '-Odph -fdph-par -fno-liberate-case'])
 
 
 test    ('dph-words-fast' 
         , [ reqlib('dph-par')
           , reqlib('dph-prim-par')
-          , expect_broken(5065)
           , only_ways(['normal']) ] 
         , multimod_compile_and_run 
         , [ 'Main'





More information about the Cvs-ghc mailing list