Repository : ssh://darcs.haskell.org//srv/darcs/testsuite On branch : master
http://hackage.haskell.org/trac/ghc/changeset/4d39beb652c978e80a598296fb286fdb1446ac04 >--------------------------------------------------------------- commit 4d39beb652c978e80a598296fb286fdb1446ac04 Author: Simon Marlow <[email protected]> Date: Mon Nov 21 15:22:37 2011 +0000 clean up test failures >--------------------------------------------------------------- tests/lib/libposix/all.T | 18 ++++++++++++++---- tests/lib/libposix/posix006.hs | 6 ++++-- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/tests/lib/libposix/all.T b/tests/lib/libposix/all.T index b925a9d..0e95e56 100644 --- a/tests/lib/libposix/all.T +++ b/tests/lib/libposix/all.T @@ -1,8 +1,18 @@ -test('posix002', reqlib('unix'), compile_and_run, ['']) -test('posix003', normal, compile_and_run, ['']) -test('posix004', reqlib('unix'), compile_and_run, ['']) +test('posix002', [ reqlib('unix'), omit_ways(prof_ways) ], + compile_and_run, ['']) + +test('posix003', normal, compile_and_run, ['']) + +# Uses forkProcess; doesn't work with threaded2 +test('posix004', [ reqlib('unix'), expect_fail_for(['threaded2']) ], + compile_and_run, ['']) + test('posix005', [reqlib('unix'), expect_broken(5648)], compile_and_run, ['']) + test('posix006', reqlib('unix'), compile_and_run, ['']) test('posix009', reqlib('unix'), compile_and_run, ['']) test('posix010', reqlib('unix'), compile_and_run, ['']) -test('posix014', reqlib('unix'), compile_and_run, ['']) + +# Uses forkProcess; doesn't work with threaded2 +test('posix014', [ reqlib('unix'), expect_fail_for(['threaded2']) ], + compile_and_run, ['']) diff --git a/tests/lib/libposix/posix006.hs b/tests/lib/libposix/posix006.hs index dfe3f1d..697e4e6 100644 --- a/tests/lib/libposix/posix006.hs +++ b/tests/lib/libposix/posix006.hs @@ -1,12 +1,14 @@ import System.Posix.Time import System.Posix.Unistd +import System.Posix.Signals main = do start <- epochTime - sleep 5 + blockSignals reservedSignals -- see #4504 + sleep 1 finish <- epochTime let slept = finish - start - if slept >= 5 && slept <= 6 + if slept >= 1 && slept <= 2 then putStrLn "OK" else do putStr "Started: " print start _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
