Support for OCaml 4.09.

src/dune

@@ -1,6 +1,6 @@
 (library (name toplevel_expect_test) (public_name toplevel_expect_test)
  (modes byte)
- (libraries toplevel_expect_test_types ppxlib ppxlib.print_diff
+ (libraries toplevel_expect_test_types ppxlib ppxlib.print_diff core
   ppx_here.expander core_kernel ppx_expect.common ppx_expect.matcher
   mlt_parser ocaml-compiler-libs.common compiler-libs.common
   compiler-libs.toplevel findlib.top unix threads ppx_inline_test.runner.lib)

src/main.ml

@@ -448,14 +448,6 @@ let process_expect_file fname ~use_color ~in_place ~sexp_output ~use_absolute_pa
     true
 ;;
 
-let override_sys_argv args =
-  let len = Array.length args in
-  assert (len <= Array.length Sys.argv);
-  Array.blit ~src:args ~src_pos:0 ~dst:Sys.argv ~dst_pos:0 ~len;
-  Obj.truncate (Obj.repr Sys.argv) len;
-  Arg.current := 0;
-;;
-
 let setup_env () =
   (* Same as what run-tests.py does, to get repeatable output *)
   List.iter ~f:(fun (k, v) -> Unix.putenv k v)
@@ -493,15 +485,21 @@ let sexp_output = ref false
 let use_absolute_path = ref false
 let allow_output_patterns = ref false
 
+[%%if ocaml_version < (4, 09, 0)]
+let init_path () = Compmisc.init_path true
+[%%else]
+let init_path () = Compmisc.init_path ()
+[%%endif]
+
 let main fname =
   let cmd_line =
     Array.sub Sys.argv ~pos:!Arg.current ~len:(Array.length Sys.argv - !Arg.current)
   in
   setup_env ();
   setup_config ();
-  override_sys_argv cmd_line;
+  Core.Sys.override_argv cmd_line;
   Toploop.set_paths ();
-  Compmisc.init_path true;
+  init_path ();
   Toploop.toplevel_env := Compmisc.initial_env ();
   Sys.interactive := false;
   Backend.init ();

toplevel_expect_test.opam

@@ -12,6 +12,7 @@ build: [
 ]
 depends: [
   "ocaml"               {>= "4.07.0"}
+  "core"                {>= "v0.12.4" & < "v0.13"}
   "core_kernel"         {>= "v0.12" & < "v0.13"}
   "mlt_parser"          {>= "v0.12" & < "v0.13"}
   "ppx_expect"          {>= "v0.12" & < "v0.13"}