summaryrefslogtreecommitdiff
path: root/testsuite/tests/concurrent
diff options
context:
space:
mode:
authorÖmer Sinan Ağacan <omeragacan@gmail.com>2019-01-10 11:55:25 +0300
committerÖmer Sinan Ağacan <omeragacan@gmail.com>2019-01-12 10:11:19 +0300
commit74cd4ec5d2f9321aad5db3285cb60d78f2562996 (patch)
tree8c2cec2852dd719a97edf8a8345ea4f84277bda7 /testsuite/tests/concurrent
parentcb2349a4233d6bdef2d7090853397e6278a7378c (diff)
downloadhaskell-74cd4ec5d2f9321aad5db3285cb60d78f2562996.tar.gz
Fix raiseAsync() UNDERFLOW_FRAME handling in profiling runtime
UNDERFLOW_FRAMEs don't have profiling headers so we have to use the AP_STACK's function's CCS as the new frame's CCS. Fixes one of the many bugs caught by concprog001 (#15508).
Diffstat (limited to 'testsuite/tests/concurrent')
-rw-r--r--testsuite/tests/concurrent/prog001/all.T3
1 files changed, 2 insertions, 1 deletions
diff --git a/testsuite/tests/concurrent/prog001/all.T b/testsuite/tests/concurrent/prog001/all.T
index 1476b4ffef..e3195833a0 100644
--- a/testsuite/tests/concurrent/prog001/all.T
+++ b/testsuite/tests/concurrent/prog001/all.T
@@ -13,5 +13,6 @@
# right now. --SDM 1/4/2010
test('concprog001', [extra_files(['Arithmetic.hs', 'Converter.hs', 'Mult.hs', 'Stream.hs', 'Thread.hs', 'Trit.hs', 'Utilities.hs']),
- when(fast(), skip), only_ways(['threaded2'])],
+ when(fast(), skip), only_ways(['threaded2']),
+ run_timeout_multiplier(2)],
multimod_compile_and_run, ['Mult', ''])