From 49a8b169e7e7139af2384ca8e350e007392e2ee3 Mon Sep 17 00:00:00 2001 From: Mark Shinwell Date: Thu, 30 Nov 2023 17:06:31 +0000 Subject: [PATCH] Re-enable some tests that it seems should work now --- ocaml/testsuite/tests/c-api/test_c_thread_has_lock.ml | 3 +-- .../tests/c-api/test_c_thread_has_lock_systhread.ml | 3 +-- ocaml/testsuite/tests/frame-pointers/c_call.ml | 3 +-- ocaml/testsuite/tests/frame-pointers/exception_handler.ml | 3 +-- ocaml/testsuite/tests/lazy/minor_major_force.ml | 4 +--- ocaml/testsuite/tests/lf_skiplist/test.ml | 4 +--- ocaml/testsuite/tests/lib-channels/close_in.ml | 5 ++--- ocaml/testsuite/tests/lib-random/testvectors.ml | 3 +-- ocaml/testsuite/tests/lib-sync/trylock.ml | 3 +-- ocaml/testsuite/tests/lib-sync/trylock2.ml | 3 +-- ocaml/testsuite/tests/lib-systhreads/boundscheck.ml | 3 +-- ocaml/testsuite/tests/memory-model/forbidden.ml | 2 +- 12 files changed, 13 insertions(+), 26 deletions(-) diff --git a/ocaml/testsuite/tests/c-api/test_c_thread_has_lock.ml b/ocaml/testsuite/tests/c-api/test_c_thread_has_lock.ml index f3e4a20be89..8d7a5d792ef 100644 --- a/ocaml/testsuite/tests/c-api/test_c_thread_has_lock.ml +++ b/ocaml/testsuite/tests/c-api/test_c_thread_has_lock.ml @@ -1,7 +1,6 @@ (* TEST modules = "test_c_thread_has_lock_cstubs.c" - * skip - reason = "OCaml 5 only" + * runtime5 ** bytecode ** native *) diff --git a/ocaml/testsuite/tests/c-api/test_c_thread_has_lock_systhread.ml b/ocaml/testsuite/tests/c-api/test_c_thread_has_lock_systhread.ml index 036068739a0..e424baa5e55 100644 --- a/ocaml/testsuite/tests/c-api/test_c_thread_has_lock_systhread.ml +++ b/ocaml/testsuite/tests/c-api/test_c_thread_has_lock_systhread.ml @@ -1,7 +1,6 @@ (* TEST modules = "test_c_thread_has_lock_cstubs.c" - * skip - reason = "OCaml 5 only" + * runtime5 ** hassysthreads include systhreads *** bytecode diff --git a/ocaml/testsuite/tests/frame-pointers/c_call.ml b/ocaml/testsuite/tests/frame-pointers/c_call.ml index e156e23d114..6d0758a7539 100644 --- a/ocaml/testsuite/tests/frame-pointers/c_call.ml +++ b/ocaml/testsuite/tests/frame-pointers/c_call.ml @@ -1,7 +1,6 @@ (* TEST -* skip -reason = "OCaml 5 only" +* runtime5 ** frame_pointers *** native readonly_files = "fp_backtrace.c c_call_.c" diff --git a/ocaml/testsuite/tests/frame-pointers/exception_handler.ml b/ocaml/testsuite/tests/frame-pointers/exception_handler.ml index 56676119b71..f67c9be4de3 100644 --- a/ocaml/testsuite/tests/frame-pointers/exception_handler.ml +++ b/ocaml/testsuite/tests/frame-pointers/exception_handler.ml @@ -1,7 +1,6 @@ (* TEST -* skip -reason = "OCaml 5 only" +* runtime5 ** frame_pointers *** native readonly_files = "fp_backtrace.c" diff --git a/ocaml/testsuite/tests/lazy/minor_major_force.ml b/ocaml/testsuite/tests/lazy/minor_major_force.ml index 90f45dc27cf..5505ed71743 100644 --- a/ocaml/testsuite/tests/lazy/minor_major_force.ml +++ b/ocaml/testsuite/tests/lazy/minor_major_force.ml @@ -1,8 +1,6 @@ (* TEST ocamlopt_flags += " -O3 " - - * skip - reason = "OCaml 5 only" + * runtime5 *) (* diff --git a/ocaml/testsuite/tests/lf_skiplist/test.ml b/ocaml/testsuite/tests/lf_skiplist/test.ml index 9118c4eab78..fc6ed2b510b 100644 --- a/ocaml/testsuite/tests/lf_skiplist/test.ml +++ b/ocaml/testsuite/tests/lf_skiplist/test.ml @@ -1,8 +1,6 @@ (* TEST modules = "stubs.c" - - * skip - reason = "OCaml 5 only" + * runtime5 *) external test_skiplist_serial : unit -> unit = "test_skiplist_serial" diff --git a/ocaml/testsuite/tests/lib-channels/close_in.ml b/ocaml/testsuite/tests/lib-channels/close_in.ml index 8c51c7d52cf..60ce46bedfa 100644 --- a/ocaml/testsuite/tests/lib-channels/close_in.ml +++ b/ocaml/testsuite/tests/lib-channels/close_in.ml @@ -1,7 +1,6 @@ (* TEST -* skip -reason = "OCaml 5 only" - *) + * runtime5 +*) (* Test that inputting bytes from a closed in_channel triggers an exception *) diff --git a/ocaml/testsuite/tests/lib-random/testvectors.ml b/ocaml/testsuite/tests/lib-random/testvectors.ml index 2d04120974b..ec2230a5d54 100644 --- a/ocaml/testsuite/tests/lib-random/testvectors.ml +++ b/ocaml/testsuite/tests/lib-random/testvectors.ml @@ -1,6 +1,5 @@ (* TEST - * skip - reason = "OCaml 5 only" + * runtime5 *) (* Check the numbers drawn from a known state against the numbers diff --git a/ocaml/testsuite/tests/lib-sync/trylock.ml b/ocaml/testsuite/tests/lib-sync/trylock.ml index 6bbdad7c739..ba28ad06f3a 100644 --- a/ocaml/testsuite/tests/lib-sync/trylock.ml +++ b/ocaml/testsuite/tests/lib-sync/trylock.ml @@ -1,6 +1,5 @@ (* TEST - * skip - reason = "OCaml 5 only" + * runtime5 *) (* Test Mutex.try_lock *) diff --git a/ocaml/testsuite/tests/lib-sync/trylock2.ml b/ocaml/testsuite/tests/lib-sync/trylock2.ml index ad60e2eec89..f8ae6d6c86c 100644 --- a/ocaml/testsuite/tests/lib-sync/trylock2.ml +++ b/ocaml/testsuite/tests/lib-sync/trylock2.ml @@ -1,6 +1,5 @@ (* TEST - * skip - reason = "OCaml 5 only" + * runtime5 *) (* Test Mutex.try_lock *) diff --git a/ocaml/testsuite/tests/lib-systhreads/boundscheck.ml b/ocaml/testsuite/tests/lib-systhreads/boundscheck.ml index 124d054ec75..1e8478ffa64 100644 --- a/ocaml/testsuite/tests/lib-systhreads/boundscheck.ml +++ b/ocaml/testsuite/tests/lib-systhreads/boundscheck.ml @@ -1,8 +1,7 @@ (* TEST include systhreads -* skip -reason = "OCaml 5 only" +* runtime5 ** hassysthreads *** bytecode *** native diff --git a/ocaml/testsuite/tests/memory-model/forbidden.ml b/ocaml/testsuite/tests/memory-model/forbidden.ml index 32a8d9fa8c5..a886eed5565 100644 --- a/ocaml/testsuite/tests/memory-model/forbidden.ml +++ b/ocaml/testsuite/tests/memory-model/forbidden.ml @@ -1,7 +1,7 @@ (* TEST modules="opt.ml barrier.ml hist.ml shared.ml run.ml outcome.ml" * skip - reason = "OCaml 5 only" + reason = "CR ocaml 5 domains: re-enable this test" ** not-bsd *** bytecode *** native