summaryrefslogtreecommitdiff
path: root/testsuite
diff options
context:
space:
mode:
authorBen Gamari <ben@smart-cactus.org>2019-03-05 11:30:57 -0500
committerMarge Bot <ben+marge-bot@smart-cactus.org>2019-03-20 18:41:32 -0400
commitf4d3aaaf318efa5a476bc35b16d0327e9d0a0b66 (patch)
treec068a6b41800fdbe4ad3d40af51f68024f7eb480 /testsuite
parent88a6e9a4e596d22d1dd8b983a15781183050f51a (diff)
downloadhaskell-f4d3aaaf318efa5a476bc35b16d0327e9d0a0b66.tar.gz
testsuite/plugins: Increase compile timeout on Windows
I think the linker is routinely eating through the timeout, leading to many spurious failures.
Diffstat (limited to 'testsuite')
-rw-r--r--testsuite/tests/plugins/all.T16
1 files changed, 11 insertions, 5 deletions
diff --git a/testsuite/tests/plugins/all.T b/testsuite/tests/plugins/all.T
index 1834e3b5cb..f345e21d12 100644
--- a/testsuite/tests/plugins/all.T
+++ b/testsuite/tests/plugins/all.T
@@ -1,9 +1,15 @@
-setTestOpts([req_interp, when(opsys('mingw32'), multi_cpu_race)])
+setTestOpts([
+ req_interp,
+ # The implementation of ghc-pkg doesn't seem to be multi-concurrent process
+ # safe on windows. These tests which mutate the package db need to be run
+ # sequentially until this is fixed. This likely means that #13194 isn't fully
+ # solved. See also #15313.
+ when(opsys('mingw32'), multi_cpu_race),
+ # The Windows toolchain, particularly linking, is remarkably slow, give it
+ # time to do its thing
+ when(opsys('mingw32'), compile_timeout_multiplier(2))
+])
-# The implementation of ghc-pkg doesn't seem to be multi-concurrent process safe
-# on windows. These tests which mutate the package db need to be run
-# sequentially until this is fixed. This likely means that #13194 isn't fully
-# solved. See also #15313.
test('plugins01',
[extra_files(['simple-plugin/']), only_ways([config.ghc_plugin_way]),