diff --git a/libraries/base/cbits/inputReady.c b/libraries/base/cbits/inputReady.c index 3f636c6b2875102e71e4d67fce2b4221c723fba2..d1c1da2e4c4986ae3cff4987d86dfbc83d7eabaf 100644 --- a/libraries/base/cbits/inputReady.c +++ b/libraries/base/cbits/inputReady.c @@ -153,6 +153,9 @@ compute_WaitForSingleObject_timeout(bool infinite, Time remaining) int fdReady(int fd, bool write, int64_t msecs, bool isSock) { +#if defined(wasm32_HOST_ARCH) + return 1; +#else bool infinite = msecs < 0; // if we need to track the time then record the end time in case we are @@ -477,4 +480,5 @@ fdReady(int fd, bool write, int64_t msecs, bool isSock) } } #endif +#endif // wasm32_HOST_ARCH } diff --git a/libraries/base/tests/IO/all.T b/libraries/base/tests/IO/all.T index a572983db8a6acbd2e3617a801411997b4ec256e..7b9070af37eb0ab84e14b6d5a957e1d2ca80de2f 100644 --- a/libraries/base/tests/IO/all.T +++ b/libraries/base/tests/IO/all.T @@ -57,7 +57,7 @@ test('hSetBuffering004', set_stdin('hSetBuffering004.hs'), compile_and_run, [''] test('ioeGetErrorString001', normal, compile_and_run, ['-cpp']) test('ioeGetFileName001', normal, compile_and_run, ['-cpp']) test('ioeGetHandle001', normal, compile_and_run, ['-cpp']) -test('isEOF001', [extra_run_opts('</dev/null'), when(arch('wasm32'), fragile(23275))], compile_and_run, ['']) +test('isEOF001', [extra_run_opts('</dev/null')], compile_and_run, ['']) test('misc001', [extra_run_opts('misc001.hs misc001.out')], compile_and_run, ['']) @@ -70,7 +70,7 @@ test('openFile005', js_broken(22261), compile_and_run, ['']) test('openFile006', [], compile_and_run, ['']) test('openFile007', js_broken(22261), compile_and_run, ['']) test('openFile008', [js_broken(22349), cmd_prefix('ulimit -n 1024; ')], compile_and_run, ['']) -test('openFile009', [when(arch('wasm32'), fragile(23284))], compile_and_run, ['']) +test('openFile009', [], compile_and_run, ['']) test('putStr001', normal, compile_and_run, ['']) test('readFile001', js_broken(22261), compile_and_run, ['']) @@ -146,7 +146,6 @@ test('encodingerror001', normal, compile_and_run, ['']) # Requires use of the FD interface which is not supported under WINIO test('T4808', [when(opsys('mingw32'), skip) - , when(arch('wasm32'), fragile(23284)) ,fragile_for(16909, concurrent_ways), exit_code(1)] , compile_and_run, ['']) test('T4895', normal, compile_and_run, ['']) diff --git a/libraries/base/tests/all.T b/libraries/base/tests/all.T index 0d5af400b4a8263bcd8104ed55f6b4c2be8bfa68..d81b9daf78b72621621c463abf42489dd9bc7551 100644 --- a/libraries/base/tests/all.T +++ b/libraries/base/tests/all.T @@ -169,7 +169,13 @@ test('qsemn001', normal, compile_and_run, ['']) test('T7457', normal, compile_and_run, ['']) -test('T7773', [when(opsys('mingw32'), skip), js_broken(22261), when(arch('wasm32'), fragile(23275))], compile_and_run, ['']) +test('T7773', + [when(opsys('mingw32'), skip), + js_broken(22261), + expect_broken_for(23272, ['ghci-opt']) # unclear + ], + compile_and_run, + ['']) # Andreas says that T7773 will not (and should not) work on Windows # Tests for kind-polymorphic Category diff --git a/testsuite/tests/codeGen/should_run/all.T b/testsuite/tests/codeGen/should_run/all.T index 8e737e87aa6e378d216b03dd1810282fc8b608b1..7ed4cb787047b2f14694e3df0748da164df35c25 100644 --- a/testsuite/tests/codeGen/should_run/all.T +++ b/testsuite/tests/codeGen/should_run/all.T @@ -29,7 +29,7 @@ test('cgrun021', extra_ways(['nursery_chunks']), compile_and_run, ['']) test('cgrun022', normal, compile_and_run, ['']) test('cgrun024', normal, compile_and_run, ['']) test('cgrun025', - [ extra_run_opts('cgrun025.hs < /dev/null'), exit_code(1), when(arch('wasm32'), fragile(23275))], + [ extra_run_opts('cgrun025.hs < /dev/null'), exit_code(1) ], compile_and_run, ['']) test('cgrun026', normal, compile_and_run, ['']) test('cgrun027', normal, compile_and_run, [''])