diff options
author | Sylvain Henry <sylvain@haskus.fr> | 2023-04-20 14:51:00 +0200 |
---|---|---|
committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2023-04-21 13:32:01 -0400 |
commit | 113e21d763678ea7e7666b708e6c2dba7e52382f (patch) | |
tree | 85ad1cbfe696b63d4152c718a56a915975f37a5d | |
parent | dae514f9835f7fe8e6643f8759cc4d0b0af9a657 (diff) | |
download | haskell-113e21d763678ea7e7666b708e6c2dba7e52382f.tar.gz |
Testsuite: replace some js_broken/js_skip predicates with req_c
Using req_c is more precise.
-rw-r--r-- | testsuite/tests/concurrent/should_run/all.T | 6 | ||||
-rw-r--r-- | testsuite/tests/ffi/should_run/all.T | 4 | ||||
-rw-r--r-- | testsuite/tests/rts/T15894/all.T | 2 | ||||
-rw-r--r-- | testsuite/tests/rts/all.T | 2 | ||||
-rw-r--r-- | testsuite/tests/rts/linker/all.T | 4 |
5 files changed, 9 insertions, 9 deletions
diff --git a/testsuite/tests/concurrent/should_run/all.T b/testsuite/tests/concurrent/should_run/all.T index 96c0b4116c..3a2b211402 100644 --- a/testsuite/tests/concurrent/should_run/all.T +++ b/testsuite/tests/concurrent/should_run/all.T @@ -260,7 +260,7 @@ test('hs_try_putmvar001', [ when(opsys('mingw32'),skip), # uses pthread APIs in the C code only_ways(['threaded1', 'threaded2', 'nonmoving_thr']), - js_skip + req_c ], compile_and_run, ['hs_try_putmvar001_c.c']) @@ -270,7 +270,7 @@ test('hs_try_putmvar001', test('hs_try_putmvar002', [pre_cmd('$MAKE -s --no-print-directory hs_try_putmvar002_setup'), omit_ways(['ghci']), - js_skip, + req_c, extra_run_opts('1 8 10000')], compile_and_run, ['hs_try_putmvar002_c.c']) @@ -280,7 +280,7 @@ test('hs_try_putmvar003', when(opsys('mingw32'),skip), # uses pthread APIs in the C code pre_cmd('$MAKE -s --no-print-directory hs_try_putmvar003_setup'), only_ways(['threaded1', 'threaded2', 'nonmoving_thr']), - js_skip, + req_c, extra_run_opts('1 16 32 100'), fragile_for(16361, ['threaded1']) ], diff --git a/testsuite/tests/ffi/should_run/all.T b/testsuite/tests/ffi/should_run/all.T index 8e1dff7b31..85bef4d775 100644 --- a/testsuite/tests/ffi/should_run/all.T +++ b/testsuite/tests/ffi/should_run/all.T @@ -192,7 +192,7 @@ test('T9274', [omit_ways(['ghci'])], compile_and_run, ['']) test('ffi023', [ omit_ways(['ghci']), extra_run_opts('1000 4'), - js_broken(22363), + req_c, pre_cmd('$MAKE -s --no-print-directory ffi023_setup') ], # The ffi023_setup hack is to ensure that we generate # ffi023_stub.h before compiling ffi023_c.c, which @@ -206,7 +206,7 @@ test('rts_clearMemory', [ extra_ways(['g1', 'nursery_chunks', 'nonmoving', 'compacting_gc']), # On windows, nonmoving way fails with bad exit code (2816) when(opsys('mingw32'), fragile(23091)), - js_broken(22363), + req_c, pre_cmd('$MAKE -s --no-print-directory rts_clearMemory_setup') ], # Same hack as ffi023 compile_and_run, ['rts_clearMemory_c.c -no-hs-main']) diff --git a/testsuite/tests/rts/T15894/all.T b/testsuite/tests/rts/T15894/all.T index 0923a9fa28..10e8458178 100644 --- a/testsuite/tests/rts/T15894/all.T +++ b/testsuite/tests/rts/T15894/all.T @@ -1,5 +1,5 @@ test('T15894', [ extra_files(['copysign.c', 'main.hs']), when(ghc_dynamic(), skip) - , js_broken(22359) + , req_c ], makefile_test, ['T15894']) diff --git a/testsuite/tests/rts/all.T b/testsuite/tests/rts/all.T index 64b21cbc89..6042a52e02 100644 --- a/testsuite/tests/rts/all.T +++ b/testsuite/tests/rts/all.T @@ -251,7 +251,7 @@ test('T5993', extra_run_opts('+RTS -k8 -RTS'), compile_and_run, ['']) test('T6006', [ omit_ways(prof_ways + ['ghci']), pre_cmd('$MAKE -s --no-print-directory T6006_setup'), - js_skip + req_c ], # The T6006_setup hack is to ensure that we generate # T6006_stub.h before compiling T6006_c.c, which diff --git a/testsuite/tests/rts/linker/all.T b/testsuite/tests/rts/linker/all.T index f4bf9f42c9..3c005fc377 100644 --- a/testsuite/tests/rts/linker/all.T +++ b/testsuite/tests/rts/linker/all.T @@ -93,13 +93,13 @@ test('T5435_v_gcc', test('T5435_dyn_asm', [extra_files(['T5435.hs', 'T5435_asm.c']), fragile(22970), - js_skip, # dynamic linking not supported by the JS backend + req_c, check_stdout(checkDynAsm)], makefile_test, ['T5435_dyn_asm']) test('T5435_dyn_gcc', [extra_files(['T5435.hs', 'T5435_gcc.c']), fragile(22970), - js_skip], # dynamic linking not supported by the JS backend + req_c], makefile_test, ['T5435_dyn_gcc']) ###################################### |