summaryrefslogtreecommitdiff
path: root/testsuite/tests
diff options
context:
space:
mode:
authorAlp Mestanogullari <alp@well-typed.com>2018-09-14 14:01:09 +0200
committerKrzysztof Gogolewski <krz.gogolewski@gmail.com>2018-09-14 14:01:09 +0200
commit3040444d3a00a3088a67e82d7f81af47f8653609 (patch)
treed1adc722750ec36ae1f9c7eaa8804bf433c87f4a /testsuite/tests
parent9c6b7493db24977595b17046e15baf76638b5317 (diff)
downloadhaskell-3040444d3a00a3088a67e82d7f81af47f8653609.tar.gz
tests: increase (compile) timeout multiplier for T13701 and MultiLayerModules
Summary: Those tests are currently making our i386 validation fail on CircleCI: https://circleci.com/gh/ghc/ghc/8827 Test Plan: Using my Phab<->CircleCI bridge to run i386 validation for this diff. Reviewers: bgamari, monoidal Reviewed By: monoidal Subscribers: rwbarton, carter GHC Trac Issues: #15484, #15383 Differential Revision: https://phabricator.haskell.org/D5103
Diffstat (limited to 'testsuite/tests')
-rw-r--r--testsuite/tests/backpack/cabal/bkpcabal01/all.T3
-rw-r--r--testsuite/tests/perf/compiler/all.T8
2 files changed, 6 insertions, 5 deletions
diff --git a/testsuite/tests/backpack/cabal/bkpcabal01/all.T b/testsuite/tests/backpack/cabal/bkpcabal01/all.T
index e470708b23..1b72bd2f70 100644
--- a/testsuite/tests/backpack/cabal/bkpcabal01/all.T
+++ b/testsuite/tests/backpack/cabal/bkpcabal01/all.T
@@ -4,6 +4,7 @@ else:
cleanup = 'CLEANUP=0'
test('bkpcabal01',
- extra_files(['p', 'q', 'impl', 'bkpcabal01.cabal', 'Setup.hs', 'Main.hs']),
+ [extra_files(['p', 'q', 'impl', 'bkpcabal01.cabal', 'Setup.hs', 'Main.hs']),
+ run_timeout_multiplier(2)],
run_command,
['$MAKE -s --no-print-directory bkpcabal01 ' + cleanup])
diff --git a/testsuite/tests/perf/compiler/all.T b/testsuite/tests/perf/compiler/all.T
index 3e724ec63f..e7c04aea4e 100644
--- a/testsuite/tests/perf/compiler/all.T
+++ b/testsuite/tests/perf/compiler/all.T
@@ -1186,8 +1186,8 @@ test('MultiLayerModules',
]),
pre_cmd('./genMultiLayerModules'),
extra_files(['genMultiLayerModules']),
- compile_timeout_multiplier(2)
- # 2 is _a lot_ (timeout after 600s, to build 600 modules),
+ compile_timeout_multiplier(5)
+ # this is _a lot_
# but this test has been failing every now and then,
# especially on i386. Let's just give it some room
# to complete successfully reliably everywhere.
@@ -1234,8 +1234,8 @@ test('T13701',
]),
pre_cmd('./genT13701'),
extra_files(['genT13701']),
- compile_timeout_multiplier(2)
- # 2 is _a lot_ (timeout after 600s, to build 600 modules),
+ compile_timeout_multiplier(4)
+ # 4 is _a lot_ (timeout after 1200s),
# but this test has been failing every now and then,
# especially on i386. Let's just give it some room
# to complete successfully reliably everywhere.