Remove CRs from the test suite (#2097)

* Reclassify 'CR ocaml 5 runtime' comments

* CR

* Reimport "lib-hashtbl" test from upstream.

* Simplify "pr7168" test.

---------

Co-authored-by: Mark Shinwell <[email protected]>

Author: xclerc

ocaml/testsuite/tests/lib-hashtbl/htbl.ml

@@ -1,16 +1,10 @@
-(* TEST
-*)
-
-(* CR ocaml 5 runtime: [String] will gain a [seeded_hash]
-   function, implemented in the OCaml 5 runtime. When that
-   happens, we should checkout this test to [tip-5].
-*)
+(* TEST *)
 
 (* Hashtable operations, using maps as a reference *)
 
 open Printf
 
-module Test(H: Hashtbl.S) (M: Map.S with type key = H.key) = struct
+module Test(H: Hashtbl.SeededS) (M: Map.S with type key = H.key) = struct
 
   let incl_mh m h =
     try
@@ -90,31 +84,31 @@ module SS = struct
   type t = string
   let compare (x:t) (y:t) = Stdlib.compare x y
   let equal (x:t) (y:t) = x=y
-  let hash = Hashtbl.hash
+  let seeded_hash = Hashtbl.seeded_hash
 end
 module SI = struct
   type t = int
   let compare (x:t) (y:t) = Stdlib.compare x y
   let equal (x:t) (y:t) = x=y
-  let hash = Hashtbl.hash
+  let seeded_hash = Hashtbl.seeded_hash
 end
 module SSP = struct
   type t = string*string
   let compare (x:t) (y:t) = Stdlib.compare x y
   let equal (x:t) (y:t) = x=y
-  let hash = Hashtbl.hash
+  let seeded_hash = Hashtbl.seeded_hash
 end
 module SSL = struct
   type t = string list
   let compare (x:t) (y:t) = Stdlib.compare x y
   let equal (x:t) (y:t) = x=y
-  let hash = Hashtbl.hash
+  let seeded_hash = Hashtbl.seeded_hash
 end
 module SSA = struct
   type t = string array
   let compare (x:t) (y:t) = Stdlib.compare x y
   let equal (x:t) (y:t) = x=y
-  let hash = Hashtbl.hash
+  let seeded_hash = Hashtbl.seeded_hash
 end
 
 module MS = Map.Make(SS)
@@ -126,11 +120,11 @@ module MSA = Map.Make(SSA)
 
 (* Generic hash wrapped as a functorial hash *)
 
-module HofM (M: Map.S) : Hashtbl.S with type key = M.key =
+module HofM (M: Map.S) : Hashtbl.SeededS with type key = M.key =
   struct
     type key = M.key
     type 'a t = (key, 'a) Hashtbl.t
-    let create s = Hashtbl.create s
+    let create ?random:bool s = Hashtbl.create s
     let clear = Hashtbl.clear
     let reset = Hashtbl.reset
     let copy = Hashtbl.copy
@@ -161,13 +155,22 @@ module HSL = HofM(MSL)
 
 (* Specific functorial hashes *)
 
-module HS2 = Hashtbl.Make(SS)
-module HI2 = Hashtbl.Make(SI)
+module HS2 = Hashtbl.MakeSeeded(SS)
+module HS3 = Hashtbl.MakeSeeded(String)
+module HI2 = Hashtbl.MakeSeeded(SI)
+
+(* Specific weak functorial hashes *)
+module WS = Ephemeron.K1.MakeSeeded(SS)
+module WSP1 = Ephemeron.K1.MakeSeeded(SSP)
+module WSP2 = Ephemeron.K2.MakeSeeded(SS)(SS)
+module WSL = Ephemeron.K1.MakeSeeded(SSL)
+module WSA = Ephemeron.Kn.MakeSeeded(SS)
 
 (* Instantiating the test *)
 
 module TS1 = Test(HS1)(MS)
 module TS2 = Test(HS2)(MS)
+module TS3 = Test(HS3)(MS)
 module TI1 = Test(HI1)(MI)
 module TI2 = Test(HI2)(MI)
 module TSP = Test(HSP)(MSP)
@@ -244,11 +247,12 @@ let _ =
   TS1.test d;
   printf "-- Strings, functorial interface\n%!";
   TS2.test d;
+  printf "-- Strings, functorial(String) interface\n%!";
+  TS3.test d;
   printf "-- Pairs of strings\n%!";
   TSP.test (pair_data d);
   printf "-- Lists of strings\n%!";
   TSL.test (list_data d)
-;;
 
 
 let () =

ocaml/testsuite/tests/lib-hashtbl/htbl.reference

@@ -14,6 +14,10 @@ Removal: passed
 Insertion: passed
 Insertion: passed
 Removal: passed
+-- Strings, functorial(String) interface
+Insertion: passed
+Insertion: passed
+Removal: passed
 -- Pairs of strings
 Insertion: passed
 Insertion: passed

ocaml/testsuite/tests/misc/pr7168.ml

@@ -72,16 +72,5 @@ let rec f x =
   ()
 
 let _ =
-  (* CR ocaml 5 runtime: we should be able
-   * to simplify this test along the same
-   * lines as upstream, as stack overflow
-   * detection is always supported in
-  * ocaml 5. *)
-  if (Gc.get ()).Gc.stack_limit = 0 then begin
-    (* We are in native code. Skip the test because some platforms cannot
-       reliably detect stack overflow. *)
-    Printf.printf "OK\n"
-  end else begin
-    try Sys.with_async_exns (fun () -> f 1)
-    with Stack_overflow -> Printf.printf "OK\n"
-  end
+  try Sys.with_async_exns (fun () -> f 1)
+  with Stack_overflow -> Printf.printf "OK\n"