diff options
| author | Simon Marlow <marlowsd@gmail.com> | 2011-06-28 08:51:37 +0100 |
|---|---|---|
| committer | Simon Marlow <marlowsd@gmail.com> | 2011-06-28 11:43:08 +0100 |
| commit | 1053d725b3520457c81e8d5000ca9d573816f88e (patch) | |
| tree | 041a76bbde797ee7f54f3856e6ac29d59eaf6d51 /testsuite/tests | |
| parent | 78dd7f5c1e7dd12a2e962066abc23901b715d245 (diff) | |
| download | haskell-1053d725b3520457c81e8d5000ca9d573816f88e.tar.gz | |
omit conc016(threaded2), it gives nondeterministic results
Diffstat (limited to 'testsuite/tests')
| -rw-r--r-- | testsuite/tests/ghc-regress/concurrent/should_run/all.T | 2 | ||||
| -rw-r--r-- | testsuite/tests/ghc-regress/concurrent/should_run/conc016.hs | 13 |
2 files changed, 8 insertions, 7 deletions
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/all.T b/testsuite/tests/ghc-regress/concurrent/should_run/all.T index 092d72c434..c177c41fa5 100644 --- a/testsuite/tests/ghc-regress/concurrent/should_run/all.T +++ b/testsuite/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/testsuite/tests/ghc-regress/concurrent/should_run/conc016.hs b/testsuite/tests/ghc-regress/concurrent/should_run/conc016.hs index b86b5c13c8..639b4306b3 100644 --- a/testsuite/tests/ghc-regress/concurrent/should_run/conc016.hs +++ b/testsuite/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 |