Commit e28bb01d authored by Alp Mestanogullari's avatar Alp Mestanogullari 🦑 Committed by Ben Gamari
Browse files

fix timeout related i686 validation issues

As can be seen on https://circleci.com/gh/ghc/ghc/7578, some
tests are failing on i686 due to too restrictive timeouts. This patch
tweaks those in the hope of solving the 4 failures from that URL due to
timeouts.

Test Plan: ./validate on i686

Reviewers: bgamari

Reviewed By: bgamari

Subscribers: rwbarton, thomie, carter

Differential Revision: https://phabricator.haskell.org/D5031
parent 24b76d1b
......@@ -1186,6 +1186,11 @@ test('MultiLayerModules',
]),
pre_cmd('./genMultiLayerModules'),
extra_files(['genMultiLayerModules']),
compile_timeout_multiplier(2)
# 2 is _a lot_ (timeout after 600s, to build 600 modules),
# 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.
],
multimod_compile,
['MultiLayerModules', '-v0'])
......@@ -1229,6 +1234,11 @@ test('T13701',
]),
pre_cmd('./genT13701'),
extra_files(['genT13701']),
compile_timeout_multiplier(2)
# 2 is _a lot_ (timeout after 600s, to build 600 modules),
# 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.
],
multimod_compile,
['T13701', '-v0'])
......@@ -1241,6 +1251,11 @@ test('T13719',
]),
pre_cmd('./genT13719'),
extra_files(['genT13719']),
compile_timeout_multiplier(2)
# 2 is _a lot_ (timeout after 600s, to build 600 modules),
# 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.
],
multimod_compile,
['T13719', '-v0'])
......
......@@ -337,7 +337,7 @@ test('tc260', normal, compile, [''])
test('tc261', normal, compile, [''])
test('tc262', normal, compile, [''])
test('tc263', [extra_files(['Tc263_Help.hs'])], multimod_compile, ['tc263', '-v0'])
test('tc265', compile_timeout_multiplier(0.01), compile, [''])
test('tc265', normal, compile, [''])
test('tc266', [extra_files(['Tc266.hs', 'Tc266a.hs', 'Tc266.hs-boot'])], run_command, ['$MAKE -s --no-print-directory tc266'])
test('Tc267', [extra_files(['Tc267a.hs', 'Tc267b.hs', 'Tc267a.hs-boot', 'Tc267b.hs-boot'])], run_command, ['$MAKE -s --no-print-directory Tc267'])
test('tc268', normal, compile, [''])
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment