ocaml-flambda · mshinwell · Nov 30, 2023 · Nov 30, 2023
diff --git a/ocaml/bytecomp/emitcode.ml b/ocaml/bytecomp/emitcode.ml
@@ -421,7 +421,8 @@ let to_file outchan unit_name objfile ~required_globals code =
         (Filename.dirname (Location.absolute_path objfile))
         !debug_dirs;
       let p = pos_out outchan in
-      (* CR mshinwell: Compression not supported in the OCaml 4 runtime
+      (* CR ocaml 5 compressed-marshal mshinwell:
+         Compression not supported in the OCaml 4 runtime
       Marshal.(to_channel outchan !events [Compression]);
       Marshal.(to_channel outchan (String.Set.elements !debug_dirs)
                           [Compression]);

diff --git a/ocaml/file_formats/cmi_format.ml b/ocaml/file_formats/cmi_format.ml
@@ -167,7 +167,8 @@ let output_cmi filename oc cmi =
   output_int64 oc len;
   Out_channel.seek oc val_pos;
   (* BACKPORT BEGIN *)
-  (* mshinwell: upstream uses [Compression] here *)
+  (* CR ocaml 5 compressed-marshal mshinwell:
+     upstream uses [Compression] here *)
   output_value oc ((cmi.cmi_name, sign) : header);
   (* BACKPORT END *)
   flush oc;

diff --git a/ocaml/file_formats/cmt_format.ml b/ocaml/file_formats/cmt_format.ml
@@ -110,7 +110,8 @@ let input_cmt ic = (input_value ic : cmt_infos)
 let output_cmt oc cmt =
   output_string oc Config.cmt_magic_number;
   (* BACKPORT BEGIN *)
-  (* mshinwell: upstream uses [Compression] here *)
+  (* CR ocaml 5 compressed-marshal mshinwell:
+     upstream uses [Compression] here *)
   Marshal.(to_channel oc (cmt : cmt_infos) [])
   (* BACKPORT END *)
 

diff --git a/ocaml/testsuite/tests/backtrace/backtrace_effects_nested.ml b/ocaml/testsuite/tests/backtrace/backtrace_effects_nested.ml
@@ -3,7 +3,7 @@
 
 flags = "-g"
 * skip
-  reason = "OCaml 5 only"
+  reason = "CR ocaml 5 effects: re-enable this test"
 ** bytecode
 ** no-flambda
 *** native

diff --git a/ocaml/testsuite/tests/callback/callback_effects_gc.ml b/ocaml/testsuite/tests/callback/callback_effects_gc.ml
@@ -1,7 +1,7 @@
 (* TEST
    ocamlrunparam += ",s=512"
    * skip
-   reason = "OCaml 5 only"
+   reason = "CR ocaml 5 effects: re-enable this test"
    ** native
 *)
 

diff --git a/ocaml/testsuite/tests/callback/nested_fiber.ml b/ocaml/testsuite/tests/callback/nested_fiber.ml
@@ -2,7 +2,7 @@
    include unix
    modules = "nested_fiber_.c"
    * skip
-     reason = "OCaml 5 only"
+     reason = "CR ocaml 5 effects: re-enable this test"
    ** libunix
    *** bytecode
    *** native

diff --git a/ocaml/testsuite/tests/callback/stack_overflow.ml b/ocaml/testsuite/tests/callback/stack_overflow.ml
@@ -2,7 +2,7 @@
    include unix
    modules = "stack_overflow_.c"
    * skip
-     reason = "OCaml 5 only"
+     reason = "CR ocaml 5 effects: re-enable this test"
    ** libunix
    *** bytecode
    *** native

diff --git a/ocaml/testsuite/tests/callback/test7.ml b/ocaml/testsuite/tests/callback/test7.ml
@@ -3,7 +3,7 @@
    include unix
    modules = "test7_.c"
    * skip
-     reason = "OCaml 5 only"
+     reason = "CR ocaml 5 effects: re-enable this test"
    ** libunix
    *** bytecode
    *** native

diff --git a/ocaml/testsuite/tests/effects/marshal.ml b/ocaml/testsuite/tests/effects/marshal.ml
@@ -1,6 +1,6 @@
 (* TEST
 * skip
-reason = "OCaml 5 only"
+reason = "CR ocaml 5 effects: re-enable this test"
  *)
 
 open Effect

diff --git a/ocaml/testsuite/tests/effects/unhandled_unlinked.ml b/ocaml/testsuite/tests/effects/unhandled_unlinked.ml
@@ -3,7 +3,7 @@
 
      exit_status= "2"
      * skip
-     reason = "OCaml 5 only"
+     reason = "CR ocaml 5 effects: re-enable this test"
 *)
 
 open Effect

diff --git a/ocaml/testsuite/tests/frame-pointers/effects.ml b/ocaml/testsuite/tests/frame-pointers/effects.ml
@@ -3,7 +3,7 @@
 
 
 * skip
-reason - "OCaml 5 only"
+reason = "CR ocaml 5 effects: re-enable this test"
 ** frame_pointers
 *** native
 readonly_files = "fp_backtrace.c"

diff --git a/ocaml/testsuite/tests/frame-pointers/reperform.ml b/ocaml/testsuite/tests/frame-pointers/reperform.ml
@@ -3,7 +3,7 @@
 
 
 * skip
-reason - "OCaml 5 only"
+reason = "CR ocaml 5 effects: re-enable this test"
 ** frame_pointers
 *** native
 

diff --git a/ocaml/testsuite/tests/frame-pointers/stack_realloc.ml b/ocaml/testsuite/tests/frame-pointers/stack_realloc.ml
@@ -3,7 +3,7 @@
 
 
 * skip
-reason - "OCaml 5 only"
+reason = "CR ocaml 5 effects: re-enable this test"
 ** frame_pointers
 *** native
 

diff --git a/ocaml/testsuite/tests/frame-pointers/stack_realloc2.ml b/ocaml/testsuite/tests/frame-pointers/stack_realloc2.ml
@@ -3,7 +3,7 @@
 
 
 * skip
-reason - "OCaml 5 only"
+reason = "CR ocaml 5 effects: re-enable this test"
 ** frame_pointers
 *** native
 

diff --git a/ocaml/testsuite/tests/gc-roots/globroots_parallel.ml b/ocaml/testsuite/tests/gc-roots/globroots_parallel.ml
@@ -3,7 +3,7 @@
    modules = "globrootsprim.c globroots.ml"
 
    * skip
-     reason = "OCaml 5 only"
+     reason = "CR ocaml 5 domains: re-enable this test"
 *)
 
 open Globroots

diff --git a/ocaml/testsuite/tests/gc-roots/globroots_parallel_spawn_burn.ml b/ocaml/testsuite/tests/gc-roots/globroots_parallel_spawn_burn.ml
@@ -3,7 +3,7 @@
    modules = "globrootsprim.c globroots.ml"
 
    * skip
-     reason = "OCaml 5 only"
+     reason = "CR ocaml 5 domains: re-enable this test"
 *)
 
 open Globroots

diff --git a/ocaml/testsuite/tests/lazy/lazy2.ml b/ocaml/testsuite/tests/lazy/lazy2.ml
@@ -1,7 +1,7 @@
 (* TEST
    ocamlopt_flags += " -O3 "
    * skip
-     reason = "OCaml 5 only"
+     reason = "CR ocaml 5 domains: re-enable this test"
 *)
 
 open Domain

diff --git a/ocaml/testsuite/tests/lazy/lazy3.ml b/ocaml/testsuite/tests/lazy/lazy3.ml
@@ -1,7 +1,7 @@
 (* TEST
    ocamlopt_flags += " -O3 "
    * skip
-     reason = "OCaml 5 only"
+     reason = "CR ocaml 5 domains: re-enable this test"
 *)
 
 let f count =

diff --git a/ocaml/testsuite/tests/lazy/lazy5.ml b/ocaml/testsuite/tests/lazy/lazy5.ml
@@ -1,7 +1,7 @@
 (* TEST
    ocamlopt_flags += " -O3 "
    * skip
-     reason = "OCaml 5 only"
+     reason = "CR ocaml 5 domains: re-enable this test"
 *)
 let rec safe_force l =
   try Lazy.force l with

diff --git a/ocaml/testsuite/tests/lazy/lazy6.ml b/ocaml/testsuite/tests/lazy/lazy6.ml
@@ -1,7 +1,7 @@
 (* TEST
    ocamlopt_flags += " -O3 "
    * skip
-     reason = "OCaml 5 only"
+     reason = "CR ocaml 5 domains: re-enable this test"
 *)
 
 let flag1 = Atomic.make false

diff --git a/ocaml/testsuite/tests/lazy/lazy7.ml b/ocaml/testsuite/tests/lazy/lazy7.ml
@@ -1,7 +1,7 @@
 (* TEST
    ocamlopt_flags += " -O3 "
    * skip
-     reason = "OCaml 5 only"
+     reason = "CR ocaml 5 domains: re-enable this test"
 *)
 
 let num_domains = 4

diff --git a/ocaml/testsuite/tests/lazy/lazy8.ml b/ocaml/testsuite/tests/lazy/lazy8.ml
@@ -1,7 +1,7 @@
 (* TEST
    ocamlopt_flags += " -O3 "
    * skip
-     reason = "OCaml 5 only"
+     reason = "CR ocaml 5 domains: re-enable this test"
 *)
 
 exception E

diff --git a/ocaml/testsuite/tests/lf_skiplist/test_parallel.ml b/ocaml/testsuite/tests/lf_skiplist/test_parallel.ml
@@ -2,7 +2,7 @@
    modules = "stubs.c"
 
    * skip
-     reason = "OCaml 5 only"
+     reason = "CR ocaml 5 domains: re-enable this test"
 *)
 
 external init_skiplist : unit -> unit = "init_skiplist"

diff --git a/ocaml/testsuite/tests/lib-channels/refcounting.ml b/ocaml/testsuite/tests/lib-channels/refcounting.ml
@@ -1,6 +1,6 @@
 (* TEST
    * skip
-   reason = "OCaml 5 only"
+   reason = "CR ocaml 5 domains: re-enable this test"
    ** expect
 *)
 

diff --git a/ocaml/testsuite/tests/lib-dynlink-domains/main.ml b/ocaml/testsuite/tests/lib-dynlink-domains/main.ml
@@ -1,6 +1,6 @@
 (* TEST
  * skip
-   reason = "OCaml 5 only"
+   reason = "CR ocaml 5 domains: re-enable this test"
 *)
 
 (* BACKPORT

diff --git a/ocaml/testsuite/tests/lib-format/domains.ml b/ocaml/testsuite/tests/lib-format/domains.ml
@@ -1,6 +1,6 @@
 (* TEST
 * skip
-reason = "OCaml 5 only"
+reason = "CR ocaml 5 domains: re-enable this test"
 *)
 
 (** Test that domains stdout and stderr are flushed at domain exit *)

diff --git a/ocaml/testsuite/tests/lib-format/mc_pr586_par.ml b/ocaml/testsuite/tests/lib-format/mc_pr586_par.ml
@@ -1,6 +1,6 @@
 (* TEST
 * skip
-reason = "OCaml 5 only"
+reason = "CR ocaml 5 domains: re-enable this test"
 *)
 
 let () =

diff --git a/ocaml/testsuite/tests/lib-format/mc_pr586_par2.ml b/ocaml/testsuite/tests/lib-format/mc_pr586_par2.ml
@@ -1,6 +1,6 @@
 (* TEST
 * skip
-reason = "OCaml 5 only"
+reason = "CR ocaml 5 domains: re-enable this test"
 *)
 
 let () =

diff --git a/ocaml/testsuite/tests/lib-marshal/intext_par.ml b/ocaml/testsuite/tests/lib-marshal/intext_par.ml
@@ -1,6 +1,6 @@
 (* TEST
 * skip
-reason = "OCaml 5 only"
+reason = "CR ocaml 5 domains: re-enable this test"
    modules = "intextaux_par.c"
 *)
 

diff --git a/ocaml/testsuite/tests/lib-random/parallel.ml b/ocaml/testsuite/tests/lib-random/parallel.ml
@@ -1,7 +1,7 @@
 (* TEST
    include unix
    * skip
-   reason = "OCaml 5 only"
+   reason = "CR ocaml 5 domains: re-enable this test"
    ** libunix
    *** bytecode
    *** native

diff --git a/ocaml/testsuite/tests/lib-str/parallel.ml b/ocaml/testsuite/tests/lib-str/parallel.ml
@@ -1,6 +1,6 @@
 (* TEST
 * skip
-reason = "OCaml 5 only"
+reason = "CR ocaml 5 domains: re-enable this test"
 ** hasstr
 include str
 *** bytecode

diff --git a/ocaml/testsuite/tests/lib-sync/prodcons.ml b/ocaml/testsuite/tests/lib-sync/prodcons.ml
@@ -1,6 +1,6 @@
 (* TEST
 * skip
-reason = "OCaml 5 only"
+reason = "CR ocaml 5 domains: re-enable this test"
 *)
 
 (* Classic producer-consumer *)

diff --git a/ocaml/testsuite/tests/lib-systhreads/multicore_lifecycle.ml b/ocaml/testsuite/tests/lib-systhreads/multicore_lifecycle.ml
@@ -1,6 +1,6 @@
 (* TEST
 * skip
-reason = "OCaml 5 only"
+reason = "CR ocaml 5 domains: re-enable this test"
 ** hassysthreads
 include systhreads
 *** bytecode

diff --git a/ocaml/testsuite/tests/lib-unix/common/multicore_fork_domain_alone.ml b/ocaml/testsuite/tests/lib-unix/common/multicore_fork_domain_alone.ml
@@ -1,7 +1,7 @@
 (* TEST
 include unix
 * skip
-reason = "OCaml 5 only"
+reason = "CR ocaml 5 domains: re-enable this test"
 ** hasunix
 *** not-windows
 **** bytecode

diff --git a/ocaml/testsuite/tests/lib-unix/common/multicore_fork_domain_alone2.ml b/ocaml/testsuite/tests/lib-unix/common/multicore_fork_domain_alone2.ml
@@ -1,7 +1,7 @@
 (* TEST
 include unix
 * skip
-reason = "OCaml 5 only"
+reason = "CR ocaml 5 domains: re-enable this test"
 ** hasunix
 *** not-windows
 **** bytecode

diff --git a/ocaml/testsuite/tests/memory-model/publish.ml b/ocaml/testsuite/tests/memory-model/publish.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
   *** not-windows
   **** bytecode

diff --git a/ocaml/testsuite/tests/parallel/atomics.ml b/ocaml/testsuite/tests/parallel/atomics.ml
@@ -1,6 +1,6 @@
 (* TEST
 * skip
-reason = "OCaml 5 only"
+reason = "CR ocaml 5 domains: re-enable this test"
 *)
 
 type u = U of unit

diff --git a/ocaml/testsuite/tests/parallel/backup_thread.ml b/ocaml/testsuite/tests/parallel/backup_thread.ml
@@ -1,6 +1,6 @@
 (* TEST
 * skip
-reason = "OCaml 5 only"
+reason = "CR ocaml 5 domains: re-enable this test"
 ** hasunix
 include unix
 *** bytecode

diff --git a/ocaml/testsuite/tests/parallel/backup_thread_pipe.ml b/ocaml/testsuite/tests/parallel/backup_thread_pipe.ml
@@ -1,6 +1,6 @@
 (* TEST
 * skip
-reason = "OCaml 5 only"
+reason = "CR ocaml 5 domains: re-enable this test"
 ** hasunix
 include unix
 *** bytecode

diff --git a/ocaml/testsuite/tests/parallel/constpromote.ml b/ocaml/testsuite/tests/parallel/constpromote.ml
@@ -1,6 +1,6 @@
 (* TEST
 * skip
-reason = "OCaml 5 only"
+reason = "CR ocaml 5 domains: re-enable this test"
 *)
 
 (* when run with the bytecode debug runtime, this test

diff --git a/ocaml/testsuite/tests/parallel/deadcont.ml b/ocaml/testsuite/tests/parallel/deadcont.ml
@@ -1,6 +1,6 @@
 (* TEST
 * skip
-reason = "OCaml 5 only"
+reason = "CR ocaml 5 effects: re-enable this test"
 *)
 
 (*

diff --git a/ocaml/testsuite/tests/parallel/domain_dls.ml b/ocaml/testsuite/tests/parallel/domain_dls.ml
@@ -1,6 +1,6 @@
 (* TEST
 * skip
-reason = "OCaml 5 only"
+reason = "CR ocaml 5 domains: re-enable this test"
 *)
 
 let check_dls () =

diff --git a/ocaml/testsuite/tests/parallel/domain_dls2.ml b/ocaml/testsuite/tests/parallel/domain_dls2.ml
@@ -1,6 +1,6 @@
 (* TEST
 * skip
-reason = "OCaml 5 only"
+reason = "CR ocaml 5 domains: re-enable this test"
 *)
 
 let _ =

diff --git a/ocaml/testsuite/tests/parallel/domain_id.ml b/ocaml/testsuite/tests/parallel/domain_id.ml
@@ -1,6 +1,6 @@
 (* TEST
 * skip
-reason = "OCaml 5 only"
+reason = "CR ocaml 5 domains: re-enable this test"
 *)
 
 open Domain

diff --git a/ocaml/testsuite/tests/parallel/domain_parallel_spawn_burn.ml b/ocaml/testsuite/tests/parallel/domain_parallel_spawn_burn.ml
@@ -1,6 +1,6 @@
 (* TEST
 * skip
-reason = "OCaml 5 only"
+reason = "CR ocaml 5 domains: re-enable this test"
 *)
 
 open Domain

diff --git a/ocaml/testsuite/tests/parallel/domain_parallel_spawn_burn_gc_set.ml b/ocaml/testsuite/tests/parallel/domain_parallel_spawn_burn_gc_set.ml
@@ -1,6 +1,6 @@
 (* TEST
 * skip
-reason = "OCaml 5 only"
+reason = "CR ocaml 5 domains: re-enable this test"
 *)
 
 open Domain