summaryrefslogtreecommitdiff
path: root/libraries/base/tests/IO
diff options
context:
space:
mode:
authorTamar Christina <tamar@zhox.com>2018-01-02 16:00:57 -0500
committerBen Gamari <ben@smart-cactus.org>2018-01-02 17:33:04 -0500
commit27b7b4db9af99aeb88dce7ef0e85131199bbf2ff (patch)
treedb4d5bbc750857ce55d7bcc09962002e4ba176d3 /libraries/base/tests/IO
parent4887c3086149a15a1e16c765682debcfbb9de145 (diff)
downloadhaskell-27b7b4db9af99aeb88dce7ef0e85131199bbf2ff.tar.gz
Windows: fix all failing tests.
This makes the testsuite pass clean on Windows again. It also fixes the `libstdc++-6.dll` error harbormaster was showing. I'm marking some tests as isolated tests to reduce their flakiness (mostly concurrency tests) when the test system is under heavy load. Updates process submodule. Test Plan: ./validate Reviewers: hvr, bgamari, erikd, simonmar Reviewed By: bgamari Subscribers: rwbarton, thomie, carter Differential Revision: https://phabricator.haskell.org/D4277
Diffstat (limited to 'libraries/base/tests/IO')
-rw-r--r--libraries/base/tests/IO/all.T9
1 files changed, 6 insertions, 3 deletions
diff --git a/libraries/base/tests/IO/all.T b/libraries/base/tests/IO/all.T
index 0de530bc2c..dba0e5e3d7 100644
--- a/libraries/base/tests/IO/all.T
+++ b/libraries/base/tests/IO/all.T
@@ -34,7 +34,8 @@ test('hReady001', normal, compile_and_run, ['-cpp'])
# data to read. It relies on piping input from 'sleep 1', which doesn't
# work for the 'ghci' way because in that case we already pipe input from
# a script, so hence omit_ways(['ghci'])
-test('hReady002', [cmd_prefix('sleep 1 |'), omit_ways(['ghci'])],
+test('hReady002', [cmd_prefix('sleep 1 |'), omit_ways(['ghci']),
+ multi_cpu_race],
compile_and_run, [''])
test('hSeek001', normal, compile_and_run, [''])
@@ -87,8 +88,10 @@ test('hDuplicateTo001', [], compile_and_run, [''])
test('countReaders001', [], compile_and_run, [''])
-test('concio001', normal, run_command, ['$MAKE -s --no-print-directory test.concio001'])
-test('concio001.thr', extra_files(['concio001.hs']), run_command, ['$MAKE -s --no-print-directory test.concio001.thr'])
+test('concio001', [normal, multi_cpu_race],
+ run_command, ['$MAKE -s --no-print-directory test.concio001'])
+test('concio001.thr', [extra_files(['concio001.hs']), multi_cpu_race],
+ run_command, ['$MAKE -s --no-print-directory test.concio001.thr'])
test('concio002', reqlib('process'), compile_and_run, [''])