Merge branch 'master' of http://darcs.haskell.org/testsuite

testsuite/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
 

testsuite/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'