v0.14-preview.122.22+320

Author: xclerc

runtime-lib/runtime.ml

@@ -96,15 +96,13 @@ module Action : sig
   type t = [
     | `Ignore
     | `Test_mode of test_mode
-    | `Collect of (unit -> unit) list ref
   ]
   val get : unit -> t
   val set : t -> unit
 end = struct
   type t = [
     | `Ignore
     | `Test_mode of test_mode
-    | `Collect of (unit -> unit) list ref
   ]
   let action : t ref = ref `Ignore
   let force_drop =
@@ -310,7 +308,6 @@ let () =
 let am_test_runner =
   match Action.get () with
   | `Test_mode _ -> true
-  | `Collect _ -> assert false
   | `Ignore -> false
 
 let am_running_inline_test_env_var =
@@ -411,10 +408,11 @@ let add_hooks ((module C) : config) f =
 
 let[@inline never] test ~config ~descr ~tags ~filename:def_filename ~line_number:def_line_number
       ~start_pos ~end_pos f =
-  let f = add_hooks config f in
-  let descr () = displayed_descr descr def_filename def_line_number start_pos end_pos in
   match Action.get () with
+  | `Ignore -> ()
   | `Test_mode { which_tests = { libname; only_test_location; which_tags }; what_to_do } ->
+    let f = add_hooks config f in
+    let descr () = displayed_descr descr def_filename def_line_number start_pos end_pos in
     let complete_tags = tags @ Module_context.current_tags () in
     let should_run =
       Some libname = !dynamic_lib
@@ -460,9 +458,6 @@ let[@inline never] test ~config ~descr ~tags ~filename:def_filename ~line_number
              backtrace (string_of_module_descr ())
        end
    end
-  | `Ignore -> ()
-  | `Collect r ->
-    r := (fun () -> if not (time_and_reset_random_seeds f) then failwith (descr ())) :: !r
 
 let set_lib_and_partition static_lib partition =
   match !dynamic_lib with
@@ -473,7 +468,7 @@ let set_lib_and_partition static_lib partition =
   | None ->
     dynamic_lib := Some static_lib;
     match Action.get () with
-    | `Collect _ | `Ignore -> ()
+    | `Ignore -> ()
     | `Test_mode { which_tests; what_to_do } ->
       if which_tests.libname = static_lib then begin
         let requires_partition =
@@ -501,25 +496,13 @@ let test_unit ~config ~descr ~tags ~filename ~line_number ~start_pos ~end_pos f
   test ~config ~descr ~tags ~filename ~line_number ~start_pos ~end_pos
     (fun () -> f (); true)
 
-let collect f =
-  let prev_action = Action.get () in
-  let tests = ref [] in
-  Action.set (`Collect tests);
-  try
-    f (); (* see comment below about why we don't reset random states *)
-    let tests = List.rev !tests in
-    Action.set prev_action;
-    tests
-  with e ->
-    Action.set prev_action;
-    raise e
-
 let[@inline never] test_module ~config ~descr ~tags ~filename:def_filename ~line_number:def_line_number
       ~start_pos ~end_pos f =
-  let f = add_hooks config f in
-  let descr () = displayed_descr descr def_filename def_line_number start_pos end_pos in
   match Action.get () with
+  | `Ignore -> ()
   | `Test_mode { which_tests = { libname; only_test_location = _; which_tags }; what_to_do } ->
+    let f = add_hooks config f in
+    let descr () = displayed_descr descr def_filename def_line_number start_pos end_pos in
     let partial_tags = tags @ Module_context.current_tags () in
     let should_run =
       Some libname = !dynamic_lib
@@ -562,10 +545,6 @@ let[@inline never] test_module ~config ~descr ~tags ~filename:def_filename ~line
               (String.uncapitalize_ascii descr) sep exn_str backtrace (string_of_module_descr ())
         end
     end
-  | `Ignore -> ()
-  | `Collect r ->
-    (* tEST_MODULE are going to be executed inline, unlike before *)
-    r := List.rev_append (collect f) !r
 
 let summarize () =
   match Action.get () with
@@ -581,7 +560,7 @@ let summarize () =
   | `Test_mode { which_tests = _; what_to_do = `List_partitions } ->
     List.iter (Printf.printf "%s\n") (Partition.all ());
     Test_result.Success
-  | (`Test_mode _ | `Collect _ as action) -> begin
+  | `Test_mode { what_to_do = `Run_partition _; which_tests } -> begin
       begin match !log with
       | None -> ()
       | Some ch -> close_out ch
@@ -593,15 +572,12 @@ let summarize () =
             Printf.eprintf "%d tests ran, %d test_modules ran\n%!" !tests_ran !test_modules_ran
           end;
           let errors =
-            match action with
-            | `Collect _ -> None
-            | `Test_mode { what_to_do = `List_partitions; _ } -> assert false
-            | `Test_mode { what_to_do = `Run_partition _; which_tests = { only_test_location; _ }; _ } ->
-              let unused_tests =
-                List.filter (fun (_, _, used) -> not !used) only_test_location in
-              match unused_tests with
-              | [] -> None
-              | _ :: _ -> Some unused_tests
+            let unused_tests =
+              List.filter (fun (_, _, used) -> not !used) which_tests.only_test_location
+            in
+            match unused_tests with
+            | [] -> None
+            | _ :: _ -> Some unused_tests
           in
           match errors with
           | Some tests ->

runtime-lib/runtime.mli

@@ -23,11 +23,7 @@ val unset_lib : string -> unit
 val test : ((unit -> bool) -> unit) test_function_args
 val test_unit : ((unit -> unit) -> unit) test_function_args
 val test_module : ((unit -> unit) -> unit) test_function_args
-val summarize : unit -> Test_result.t
-  [@@deprecated "[since 2016-04] use add_evaluator instead"]
 
-(** These values are meant to be used inside a user's tests. *)
-val collect : (unit -> unit) -> (unit -> unit) list
 
 (** [`Am_test_runner] means the [./inline_tests_runner] process, whereas
     [`Am_child_of_test_runner] means a process descended from the test runner. *)