Fix include in expect tests (#2558)

* Fix `include` in expect tests

* Update ocaml/testsuite/tools/expect_test.ml

Co-authored-by: Nick Roberts <[email protected]>

* Update ocaml/testsuite/tools/expect_test.ml

Co-authored-by: Nick Roberts <[email protected]>

* Fixes

* Sync files

* Fix

* Update ocaml/testsuite/tests/tool-expect-test/include.ml

Co-authored-by: Nick Roberts <[email protected]>

---------

Co-authored-by: Diana Kalinichenko <[email protected]>
Co-authored-by: Nick Roberts <[email protected]>

Author: 3 people

ocaml/ocamltest/ocaml_actions.ml

@@ -794,17 +794,22 @@ let cc =
 
 let run_expect_once input_file principal log env =
   let expect_flags = Sys.safe_getenv "EXPECT_FLAGS" in
-  let repo_root = "-repo-root " ^ Ocaml_directories.srcdir in
   let principal_flag = if principal then "-principal" else "" in
   let commandline =
   [
     Ocaml_commands.ocamlrun_expect_test;
     expect_flags;
+    Ocaml_flags.toplevel_default_flags;
+    Ocaml_flags.stdlib;
+    directory_flags env;
+    Ocaml_flags.include_toplevel_directory;
     flags env;
-    repo_root;
     principal_flag;
+    libraries Bytecode env;
+    binary_modules Bytecode env;
     input_file
-  ] in
+  ]
+  in
   let exit_status =
     Actions_helpers.run_cmd ~environment:default_ocaml_env log env commandline
   in

ocaml/testsuite/tests/tool-expect-test/include.ml

@@ -0,0 +1,13 @@
+(* TEST
+ include unix;
+ hasunix;
+ libunix;
+ expect;
+*)
+
+(* Test that [include] works in expect tests: the Unix module is not
+   available by default. *)
+Unix.sleepf 0.01;;
+[%%expect {|
+- : unit = ()
+|}]

ocaml/testsuite/tools/expect_test.ml

@@ -315,6 +315,19 @@ let process_expect_file fname =
 
 let repo_root = ref None
 let keep_original_error_size = ref false
+let preload_objects = ref []
+let main_file = ref None
+
+let read_anonymous_arg fname =
+  if Filename.check_suffix fname ".cmo"
+          || Filename.check_suffix fname ".cma"
+  then preload_objects := fname :: !preload_objects
+  else
+  match !main_file with
+  | None -> main_file := Some fname
+  | Some _ ->
+    Printf.eprintf "expect_test: multiple input source files\n";
+    exit 2
 
 let main fname =
   if not !keep_original_error_size then
@@ -337,6 +350,13 @@ let main fname =
   end;
   Compmisc.init_path ~auto_include:Load_path.no_auto_include ();
   Toploop.initialize_toplevel_env ();
+  let objects = List.rev (!preload_objects) in
+  List.iter objects ~f:(fun obj_fname ->
+    match Topeval.load_file false Format.err_formatter obj_fname with
+    | true -> ()
+    | false ->
+      Printf.eprintf "expect_test: failed to load object %s\n" obj_fname;
+      exit 2);
   (* We are in interactive mode and should record directive error on stdout *)
   Sys.interactive := true;
   process_expect_file fname;
@@ -347,7 +367,7 @@ module Options = Main_args.Make_bytetop_options (struct
   let _stdin () = (* disabled *) ()
   let _args = Arg.read_arg
   let _args0 = Arg.read_arg0
-  let anonymous s = main s
+  let anonymous s = read_anonymous_arg s
 end);;
 
 let args =
@@ -366,9 +386,12 @@ let usage = "Usage: expect_test <options> [script-file [arguments]]\n\
 let () =
   Clflags.color := Some Misc.Color.Never;
   try
-    Arg.parse args main usage;
-    Printf.eprintf "expect_test: no input file\n";
-    exit 2
+    Arg.parse args read_anonymous_arg usage;
+    match !main_file with
+    | Some fname -> main fname
+    | None ->
+      Printf.eprintf "expect_test: no input file\n";
+      exit 2
   with exn ->
     Location.report_exception Format.err_formatter exn;
     exit 2

testsuite/tools/expect_test.ml

@@ -315,6 +315,19 @@ let process_expect_file fname =
 
 let repo_root = ref None
 let keep_original_error_size = ref false
+let preload_objects = ref []
+let main_file = ref None
+
+let read_anonymous_arg fname =
+  if Filename.check_suffix fname ".cmo"
+          || Filename.check_suffix fname ".cma"
+  then preload_objects := fname :: !preload_objects
+  else
+  match !main_file with
+  | None -> main_file := Some fname
+  | Some _ ->
+    Printf.eprintf "expect_test: multiple input source files\n";
+    exit 2
 
 let main fname =
   if not !keep_original_error_size then
@@ -335,8 +348,15 @@ let main fname =
         Clflags.no_std_include := true;
         Compenv.last_include_dirs := [Filename.concat dir "stdlib"]
   end;
-  Compmisc.init_path ();
+  Compmisc.init_path ~auto_include:Load_path.no_auto_include ();
   Toploop.initialize_toplevel_env ();
+  let objects = List.rev (!preload_objects) in
+  List.iter objects ~f:(fun obj_fname ->
+    match Topeval.load_file false Format.err_formatter obj_fname with
+    | true -> ()
+    | false ->
+      Printf.eprintf "expect_test: failed to load object %s\n" obj_fname;
+      exit 2);
   (* We are in interactive mode and should record directive error on stdout *)
   Sys.interactive := true;
   process_expect_file fname;
@@ -347,7 +367,7 @@ module Options = Main_args.Make_bytetop_options (struct
   let _stdin () = (* disabled *) ()
   let _args = Arg.read_arg
   let _args0 = Arg.read_arg0
-  let anonymous s = main s
+  let anonymous s = read_anonymous_arg s
 end);;
 
 let args =
@@ -366,9 +386,12 @@ let usage = "Usage: expect_test <options> [script-file [arguments]]\n\
 let () =
   Clflags.color := Some Misc.Color.Never;
   try
-    Arg.parse args main usage;
-    Printf.eprintf "expect_test: no input file\n";
-    exit 2
+    Arg.parse args read_anonymous_arg usage;
+    match !main_file with
+    | Some fname -> main fname
+    | None ->
+      Printf.eprintf "expect_test: no input file\n";
+      exit 2
   with exn ->
     Location.report_exception Format.err_formatter exn;
     exit 2