Don't chdir at toplevel

Signed-off-by: Jeremie Dimino <[email protected]>
ocaml · Sep 29, 2021 · b372342 · b372342
1 parent 957a059
commit b372342
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 11 deletions.
diff --git a/test/expect-tests/dune_file_watcher/dune_file_watcher_tests_lib.ml b/test/expect-tests/dune_file_watcher/dune_file_watcher_tests_lib.ml
@@ -3,17 +3,15 @@ let printf = Printf.printf
 open Base
 open Stdune
 
-let tmp_dir = Stdlib.Filename.concat (Unix.getcwd ()) "working-dir"
-
-let () =
-  try Unix.mkdir tmp_dir 0o777 with
-  | _ -> ()
-
-let () = Unix.chdir tmp_dir
-
-let () = Path.set_root (Path.External.of_string tmp_dir)
-
-let () = Path.Build.set_build_dir (Path.Build.Kind.of_string "_build")
+let init () =
+  let tmp_dir = Stdlib.Filename.concat (Unix.getcwd ()) "working-dir" in
+  let () =
+    try Unix.mkdir tmp_dir 0o777 with
+    | _ -> ()
+  in
+  Unix.chdir tmp_dir;
+  Path.set_root (Path.External.of_string tmp_dir);
+  Path.Build.set_build_dir (Path.Build.Kind.of_string "_build")
 
 let now () = Unix.gettimeofday ()
 

diff --git a/test/expect-tests/dune_file_watcher/dune_file_watcher_tests_linux.ml b/test/expect-tests/dune_file_watcher/dune_file_watcher_tests_linux.ml
@@ -1,6 +1,8 @@
 open Stdune
 open Dune_file_watcher_tests_lib
 
+let%expect_test _ = init ()
+
 let%expect_test _ =
   let mutex = Mutex.create () in
   let critical_section ~f =

diff --git a/test/expect-tests/dune_file_watcher/dune_file_watcher_tests_macos.ml b/test/expect-tests/dune_file_watcher/dune_file_watcher_tests_macos.ml
@@ -1,6 +1,8 @@
 open Stdune
 open Dune_file_watcher_tests_lib
 
+let%expect_test _ = init ()
+
 let%expect_test _ =
   let mutex = Mutex.create () in
   let critical_section ~f =