diff options
| author | Paolo Capriotti <p.capriotti@gmail.com> | 2012-07-27 13:59:43 +0100 |
|---|---|---|
| committer | Paolo Capriotti <p.capriotti@gmail.com> | 2012-07-27 14:04:24 +0100 |
| commit | 822f996b57fab364ff06fd191d42270cfe6c79ec (patch) | |
| tree | c82d100e8c67638f2b57f04a2f1935454164f26c /testsuite/tests/programs | |
| parent | 3afc015b072b6474520e94c1f58aa78175f17043 (diff) | |
| download | haskell-822f996b57fab364ff06fd191d42270cfe6c79ec.tar.gz | |
Fix failures in the full testsuite
Diffstat (limited to 'testsuite/tests/programs')
| -rw-r--r-- | testsuite/tests/programs/joao-circular/Visfun_Lazy.hs | 1 | ||||
| -rw-r--r-- | testsuite/tests/programs/jules_xref2/Main.hs | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/testsuite/tests/programs/joao-circular/Visfun_Lazy.hs b/testsuite/tests/programs/joao-circular/Visfun_Lazy.hs index 494604eb1d..6430e549ab 100644 --- a/testsuite/tests/programs/joao-circular/Visfun_Lazy.hs +++ b/testsuite/tests/programs/joao-circular/Visfun_Lazy.hs @@ -559,6 +559,7 @@ visit_PPRoot (C_Best_1 t_PPS ) x_pw = (x_fmts ) x_frame_1 = (C_F_1 x_pw x_pw) x_fmts = (eq_best_fmts x_pw x_fmts_1) (x_error_1 , x_fmts_1 , x_maxh_1 , x_minll_1 , x_minw_1 ) = visit_PPS t_PPS x_frame_1 +visit_PPS :: PPS -> T_Frame -> (Bool, T_Formats, INT, Integer, Integer) visit_PPS (C_Above_1 t_PPS_2 t_PPS_3 ) x_frame = (x_error , x_fmts , x_maxh , x_minll , x_minw ) where x_frame_2 = x_frame diff --git a/testsuite/tests/programs/jules_xref2/Main.hs b/testsuite/tests/programs/jules_xref2/Main.hs index 10d20a5671..a2c966ed98 100644 --- a/testsuite/tests/programs/jules_xref2/Main.hs +++ b/testsuite/tests/programs/jules_xref2/Main.hs @@ -1,7 +1,10 @@ +{-# LANGUAGE ScopedTypeVariables #-} -- partain: the failure (crashing) was w/ -prof-auto compilation module Main where +import Control.Exception (IOException, catch) + xreff :: Int -> [String] -> Table -> Int -> String -> String xreff cc exs stab lineno [] = display (foldl delete stab exs) xreff cc exs stab lineno ('\n':cs) = xreff cc exs stab (lineno+1) cs @@ -61,7 +64,7 @@ dispNos (n:ns) = ' ':(show n ++ dispNos ns) main = do input <- getContents - exceptions <- catch (readFile "exceptions") (\ e -> return "") + exceptions <- catch (readFile "exceptions") (\(e :: IOException) -> return "") putStr (xref (lines exceptions) input) {- OLD 1.2: |