Repository : ssh://darcs.haskell.org//srv/darcs/testsuite On branch : master
http://hackage.haskell.org/trac/ghc/changeset/0df0ed30b5a7d660b22e4e60a8cfd80b62dbddba >--------------------------------------------------------------- commit 0df0ed30b5a7d660b22e4e60a8cfd80b62dbddba Author: Simon Marlow <[email protected]> Date: Tue Jun 28 08:51:37 2011 +0100 omit conc016(threaded2), it gives nondeterministic results >--------------------------------------------------------------- tests/ghc-regress/concurrent/should_run/all.T | 2 +- tests/ghc-regress/concurrent/should_run/conc016.hs | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/tests/ghc-regress/concurrent/should_run/all.T b/tests/ghc-regress/concurrent/should_run/all.T index 092d72c..c177c41 100644 --- a/tests/ghc-regress/concurrent/should_run/all.T +++ b/tests/ghc-regress/concurrent/should_run/all.T @@ -88,7 +88,7 @@ test('conc013', only_compiler_types(['ghc']), compile_and_run, ['']) test('conc014', only_compiler_types(['ghc']), compile_and_run, ['']) test('conc015', only_compiler_types(['ghc']), compile_and_run, ['']) test('conc015a', only_compiler_types(['ghc']), compile_and_run, ['']) -test('conc016', [ expect_fail_for(['threaded2']), # see comment in conc016.hs +test('conc016', [ omit_ways(['threaded2']), # see comment in conc016.hs only_compiler_types(['ghc']) ], compile_and_run, ['']) test('conc017', only_compiler_types(['ghc']), compile_and_run, ['']) test('conc017a', only_compiler_types(['ghc']), compile_and_run, ['']) diff --git a/tests/ghc-regress/concurrent/should_run/conc016.hs b/tests/ghc-regress/concurrent/should_run/conc016.hs index b86b5c1..639b430 100644 --- a/tests/ghc-regress/concurrent/should_run/conc016.hs +++ b/tests/ghc-regress/concurrent/should_run/conc016.hs @@ -4,12 +4,13 @@ import Control.Exception -- check that we can still kill a thread that is blocked on -- delivering an exception to us. --- NB. this test is delicate since 6.14, because throwTo is now always --- interruptible, so the main thread's killThread can be legitimately --- interrupted by the child thread's killThread, rather than the other --- way around. This happens because the child thread is running on --- another processor, so the main thread's throwTo is blocked waiting --- for a response, and while waiting it is interruptible. +-- NB. this test is non-deterministic in the threaded2 way since 6.14, +-- because throwTo is now always interruptible, so the main thread's +-- killThread can be legitimately interrupted by the child thread's +-- killThread, rather than the other way around. This happens because +-- the child thread is running on another processor, so the main +-- thread's throwTo is blocked waiting for a response, and while +-- waiting it is interruptible. main = do main_thread <- myThreadId _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
