summaryrefslogtreecommitdiff
path: root/testsuite/tests/concurrent
diff options
context:
space:
mode:
authorThomas Miedema <thomasmiedema@gmail.com>2015-06-12 13:52:02 +0200
committerThomas Miedema <thomasmiedema@gmail.com>2015-06-13 01:01:08 +0200
commit6e542a62e070b113f95908315c81d01c300d8803 (patch)
tree3b0962020555dd6b22907956d0795023df3cc886 /testsuite/tests/concurrent
parent5ddd90415f307cac72d75d86da58e552b168ee30 (diff)
downloadhaskell-6e542a62e070b113f95908315c81d01c300d8803.tar.gz
Testsuite: add function compile_timeout_multiplier (#10345)
And rename timeout_multiplier to run_timeout_multiplier. timeout_multiplier was added in commit a00389794b839971c7d52ead9e8570bfaa25ac55. The name suggested that it would affect any test, but it actually only affected tests that had a run component, and only that run component (as needed by test T367). Differential Revision: https://phabricator.haskell.org/D982
Diffstat (limited to 'testsuite/tests/concurrent')
-rw-r--r--testsuite/tests/concurrent/should_run/all.T8
1 files changed, 6 insertions, 2 deletions
diff --git a/testsuite/tests/concurrent/should_run/all.T b/testsuite/tests/concurrent/should_run/all.T
index 5288ff9811..2d3ac2e376 100644
--- a/testsuite/tests/concurrent/should_run/all.T
+++ b/testsuite/tests/concurrent/should_run/all.T
@@ -22,8 +22,12 @@ test('conc072', only_ways(['threaded2']), compile_and_run, [''])
test('conc073', normal, compile_and_run, [''])
# vector code must get inlined to become non-allocating
-test('T367', [reqlib('vector'), omit_ways(['ghci']), timeout_multiplier(0.001)], compile_and_run, ['-O2 -fno-omit-yields'])
-test('T367_letnoescape', [timeout_multiplier(0.02), expect_broken_for(7297,['optllvm'])], compile_and_run, ['-fno-omit-yields'])
+test('T367',
+ [reqlib('vector'), omit_ways(['ghci']), run_timeout_multiplier(0.001)],
+ compile_and_run, ['-O2 -fno-omit-yields'])
+test('T367_letnoescape',
+ [run_timeout_multiplier(0.02), expect_broken_for(7297,['optllvm'])],
+ compile_and_run, ['-fno-omit-yields'])
test('T1980', normal, compile_and_run, [''])
test('T2910', normal, compile_and_run, [''])