[commit: ghc] master: fix allocLimit3 on Windows (8c10b67)

git at git.haskell.org git at git.haskell.org
Wed Nov 12 15:35:00 UTC 2014


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

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/8c10b67ba049477cc9ed23e61f5bd119e1cefc29/ghc

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

commit 8c10b67ba049477cc9ed23e61f5bd119e1cefc29
Author: Simon Marlow <marlowsd at gmail.com>
Date:   Thu Nov 6 16:42:49 2014 +0000

    fix allocLimit3 on Windows


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

8c10b67ba049477cc9ed23e61f5bd119e1cefc29
 testsuite/tests/concurrent/should_run/all.T | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/testsuite/tests/concurrent/should_run/all.T b/testsuite/tests/concurrent/should_run/all.T
index b77d9ac..e72bffe 100644
--- a/testsuite/tests/concurrent/should_run/all.T
+++ b/testsuite/tests/concurrent/should_run/all.T
@@ -90,7 +90,12 @@ test('T9379', normal, compile_and_run, [''])
 
 test('allocLimit1', exit_code(1), compile_and_run, [''])
 test('allocLimit2', normal, compile_and_run, [''])
-test('allocLimit3', exit_code(1), compile_and_run, [''])
+
+# The non-threaded RTS on Windows doesn't handle throwing exceptions at I/O
+# operations very well, and ends up duplicating the I/O, giving wrong results.
+test('allocLimit3', [ when(opsys('mingw32'), only_ways(threaded_ways)),
+                      exit_code(1) ], compile_and_run, [''])
+
 test('allocLimit4', [ extra_run_opts('+RTS -xq300k -RTS') ],
                     compile_and_run, [''])
 



More information about the ghc-commits mailing list