[commit: ghc] master, wip/deploy-docs, wip/packaging-fail, wip/run-nofib, wip/windows-32bit: testsuite/plugins: Increase compile timeout on Windows (f4d3aaa)

git at git.haskell.org git at git.haskell.org
Thu Mar 21 17:00:35 UTC 2019


Repository : ssh://git@git.haskell.org/ghc

On branches: master,wip/deploy-docs,wip/packaging-fail,wip/run-nofib,wip/windows-32bit
Link       : http://ghc.haskell.org/trac/ghc/changeset/f4d3aaaf318efa5a476bc35b16d0327e9d0a0b66/ghc

>---------------------------------------------------------------

commit f4d3aaaf318efa5a476bc35b16d0327e9d0a0b66
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Tue Mar 5 11:30:57 2019 -0500

    testsuite/plugins: Increase compile timeout on Windows
    
    I think the linker is routinely eating through the timeout,
    leading to many spurious failures.


>---------------------------------------------------------------

f4d3aaaf318efa5a476bc35b16d0327e9d0a0b66
 testsuite/tests/plugins/all.T | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/testsuite/tests/plugins/all.T b/testsuite/tests/plugins/all.T
index 1834e3b..f345e21 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]),



More information about the ghc-commits mailing list