From 1891f1f5fafb9c89bbced5fc1ee84d31d9e923ba Mon Sep 17 00:00:00 2001 From: Ben Lippmeier <benl@ouroborus.net> Date: Fri, 24 Jun 2011 13:50:27 +1000 Subject: [PATCH] Fix dph-words. sliceP no wants its second argument to be the slice length. from George. --- testsuite/tests/ghc-regress/dph/words/WordsVect.hs | 4 ++-- testsuite/tests/ghc-regress/dph/words/dph-words.T | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/testsuite/tests/ghc-regress/dph/words/WordsVect.hs b/testsuite/tests/ghc-regress/dph/words/WordsVect.hs index 43880fd563..abf416e763 100644 --- a/testsuite/tests/ghc-regress/dph/words/WordsVect.hs +++ b/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 diff --git a/testsuite/tests/ghc-regress/dph/words/dph-words.T b/testsuite/tests/ghc-regress/dph/words/dph-words.T index 9d40d1d7b8..c89d01b08e 100644 --- a/testsuite/tests/ghc-regress/dph/words/dph-words.T +++ b/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' -- GitLab