diff options
| author | Simon Marlow <marlowsd@gmail.com> | 2016-10-21 12:02:57 -0400 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2016-10-22 12:20:59 -0400 |
| commit | acc98510c5e32474b0bba9fba54e78df2b11078c (patch) | |
| tree | c43e4c109c2759ac680ee907696f2d3bb71fd76e /testsuite/tests/concurrent | |
| parent | f41a8a369796985a75dd618b969292e1e7033112 (diff) | |
| download | haskell-acc98510c5e32474b0bba9fba54e78df2b11078c.tar.gz | |
Fix failure in setnumcapabilities001 (#12728)
The value of enabled_capabilities can change across a call to
requestSync(), and we were erroneously using an old value, causing
things to go wrong later. It manifested as an assertion failure, I'm
not sure whether there are worse consequences or not, but we should
get this fix into 8.0.2 anyway.
The failure didn't happen for me because it only shows up on machines
with fewer than 4 processors, due to the new logic to enable -qn
automatically. I've bumped the test parameter 8 to make it more
likely to exercise that code.
Test Plan: Ran setnumcapabilities001 many times
Reviewers: niteria, austin, erikd, rwbarton, bgamari
Reviewed By: bgamari
Subscribers: thomie
Differential Revision: https://phabricator.haskell.org/D2617
GHC Trac Issues: #12728
Diffstat (limited to 'testsuite/tests/concurrent')
| -rw-r--r-- | testsuite/tests/concurrent/should_run/all.T | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/testsuite/tests/concurrent/should_run/all.T b/testsuite/tests/concurrent/should_run/all.T index 6eda0007b0..e3e053eae9 100644 --- a/testsuite/tests/concurrent/should_run/all.T +++ b/testsuite/tests/concurrent/should_run/all.T @@ -249,7 +249,7 @@ test('conc068', [ omit_ways('threaded2'), exit_code(1) ], compile_and_run, ['']) test('setnumcapabilities001', [ only_ways(['threaded1','threaded2']), - extra_run_opts('4 12 2000'), + extra_run_opts('8 12 2000'), req_smp ], compile_and_run, ['']) |