Fix tests escaping their sandbox (#1217)

* Fix tests escaping their sandbox

CLI tests need a `dune-project` and a `.ocamlformat` file to run.
This dependencies were not declared so OCamlformat was searching until it find
the root of the directory (escaping the `_build` directory).

This is needed to use dune-release.

* Use --root instead of depending on dune-project

Author: Julow

test/cli/dune

@@ -90,39 +90,51 @@
   (diff err_stdin_no_kind.expected err_stdin_no_kind.output)))
 
 (rule
- (with-outputs-to
-  stdin_and_impl.output
-  (system "%{bin:ocamlformat} --impl - < %{dep:sample/b.ml}")))
+ (targets stdin_and_impl.output)
+ (deps .ocamlformat)
+ (action
+  (with-outputs-to
+   %{targets}
+   (system "%{bin:ocamlformat} --root=. --impl - < %{dep:sample/b.ml}"))))
 
 (alias
  (name runtest)
  (action
   (diff stdin_and_impl.expected stdin_and_impl.output)))
 
 (rule
- (with-outputs-to
-  stdin_and_intf.output
-  (system "%{bin:ocamlformat} --intf - < %{dep:sample/a.mli}")))
+ (targets stdin_and_intf.output)
+ (deps .ocamlformat)
+ (action
+  (with-outputs-to
+   %{targets}
+   (system "%{bin:ocamlformat} --root=. --intf - < %{dep:sample/a.mli}"))))
 
 (alias
  (name runtest)
  (action
   (diff stdin_and_intf.expected stdin_and_intf.output)))
 
 (rule
- (with-outputs-to
-  stdin_and_name.output
-  (system "%{bin:ocamlformat} --name a.ml - < %{dep:sample/b.ml}")))
+ (targets stdin_and_name.output)
+ (deps .ocamlformat)
+ (action
+  (with-outputs-to
+   %{targets}
+   (system "%{bin:ocamlformat} --root=. --name a.ml - < %{dep:sample/b.ml}"))))
 
 (alias
  (name runtest)
  (action
   (diff stdin_and_name.expected stdin_and_name.output)))
 
 (rule
- (with-outputs-to
-  name_unknown_ext.output
-  (system "%{bin:ocamlformat} --name b.cpp %{dep:sample/b.ml}")))
+ (targets name_unknown_ext.output)
+ (deps .ocamlformat)
+ (action
+  (with-outputs-to
+   %{targets}
+   (system "%{bin:ocamlformat} --root=. --name b.cpp %{dep:sample/b.ml}"))))
 
 (alias
  (name runtest)
@@ -186,50 +198,65 @@
     err_several_files_and_name_inplace.output)))
 
 (rule
- (with-outputs-to
-  fmterr_file_and_name.output
-  (system "! %{bin:ocamlformat} --name foo.ml %{dep:sample/syntax_error.ml}")))
+ (targets fmterr_file_and_name.output)
+ (deps .ocamlformat)
+ (action
+  (with-outputs-to
+   %{targets}
+   (system "! %{bin:ocamlformat} --root=. --name foo.ml %{dep:sample/syntax_error.ml}"))))
 
 (alias
  (name runtest)
  (action
   (diff fmterr_file_and_name.expected fmterr_file_and_name.output)))
 
 (rule
- (with-outputs-to
-  fmterr_stdin_and_name.output
-  (system
-    "! %{bin:ocamlformat} --name foo.ml - < %{dep:sample/syntax_error.ml}")))
+ (targets fmterr_stdin_and_name.output)
+ (deps .ocamlformat)
+ (action
+  (with-outputs-to
+   %{targets}
+   (system
+     "! %{bin:ocamlformat} --root=. --name foo.ml - < %{dep:sample/syntax_error.ml}"))))
 
 (alias
  (name runtest)
  (action
   (diff fmterr_stdin_and_name.expected fmterr_stdin_and_name.output)))
 
 (rule
- (with-outputs-to
-  fmterr_file_bad_kind.output
-  (system "! %{bin:ocamlformat} --impl %{dep:sample/a.mli}")))
+ (targets fmterr_file_bad_kind.output)
+ (deps .ocamlformat)
+ (action
+  (with-outputs-to
+   %{targets}
+   (system "! %{bin:ocamlformat} --root=. --impl %{dep:sample/a.mli}"))))
 
 (alias
  (name runtest)
  (action
   (diff fmterr_file_bad_kind.expected fmterr_file_bad_kind.output)))
 
 (rule
- (with-outputs-to
-  fmterr_stdin_bad_kind.output
-  (system "! %{bin:ocamlformat} --impl - < %{dep:sample/a.mli}")))
+ (targets fmterr_stdin_bad_kind.output)
+ (deps .ocamlformat)
+ (action
+  (with-outputs-to
+   %{targets}
+   (system "! %{bin:ocamlformat} --root=. --impl - < %{dep:sample/a.mli}"))))
 
 (alias
  (name runtest)
  (action
   (diff fmterr_stdin_bad_kind.expected fmterr_stdin_bad_kind.output)))
 
 (rule
- (with-outputs-to
-  fmterr_file_and_name_bad_kind.output
-  (system "! %{bin:ocamlformat} --name foo.ml %{dep:sample/a.mli}")))
+ (targets fmterr_file_and_name_bad_kind.output)
+ (deps .ocamlformat)
+ (action
+  (with-outputs-to
+   %{targets}
+   (system "! %{bin:ocamlformat} --root=. --name foo.ml %{dep:sample/a.mli}"))))
 
 (alias
  (name runtest)
@@ -238,9 +265,12 @@
     fmterr_file_and_name_bad_kind.output)))
 
 (rule
- (with-outputs-to
-  fmterr_stdin_and_name_bad_kind.output
-  (system "! %{bin:ocamlformat} --name foo.ml - < %{dep:sample/a.mli}")))
+ (targets fmterr_stdin_and_name_bad_kind.output)
+ (deps .ocamlformat)
+ (action
+  (with-outputs-to
+   %{targets}
+   (system "! %{bin:ocamlformat} --root=. --name foo.ml - < %{dep:sample/a.mli}"))))
 
 (alias
  (name runtest)
@@ -249,49 +279,64 @@
     fmterr_stdin_and_name_bad_kind.output)))
 
 (rule
- (with-outputs-to
-  check_formatted.output
-  (run %{bin:ocamlformat} --check %{dep:sample/a.ml})))
+ (targets check_formatted.output)
+ (deps .ocamlformat)
+ (action
+  (with-outputs-to
+   %{targets}
+   (run %{bin:ocamlformat} --root=. --check %{dep:sample/a.ml}))))
 
 (alias
  (name runtest)
  (action
   (diff check_formatted.expected check_formatted.output)))
 
 (rule
- (with-outputs-to
-  check_not_formatted.output
-  (system "! %{bin:ocamlformat} --check %{dep:sample/b.ml}")))
+ (targets check_not_formatted.output)
+ (deps .ocamlformat)
+ (action
+  (with-outputs-to
+   %{targets}
+   (system "! %{bin:ocamlformat} --root=. --check %{dep:sample/b.ml}"))))
 
 (alias
  (name runtest)
  (action
   (diff check_not_formatted.expected check_not_formatted.output)))
 
 (rule
- (with-outputs-to
-  debug.output
-  (run %{bin:ocamlformat} --debug %{dep:sample/b.ml})))
+ (targets debug.output)
+ (deps .ocamlformat)
+ (action
+  (with-outputs-to
+   %{targets}
+   (run %{bin:ocamlformat} --root=. --debug %{dep:sample/b.ml}))))
 
 (alias
  (name runtest)
  (action
   (diff debug.expected debug.output)))
 
 (rule
- (with-outputs-to
-  max_iter_1_ok.output
-  (run ocamlformat --max-iters=1 %{dep:sample/a.ml})))
+ (targets max_iter_1_ok.output)
+ (deps .ocamlformat)
+ (action
+  (with-outputs-to
+   %{targets}
+   (run ocamlformat --root=. --max-iters=1 %{dep:sample/a.ml}))))
 
 (alias
  (name runtest)
  (action
   (diff max_iter_1_ok.expected max_iter_1_ok.output)))
 
 (rule
- (with-outputs-to
-  max_iter_1_failing.output
-  (system "! %{bin:ocamlformat} --max-iters=1 %{dep:sample/b.ml}")))
+ (targets max_iter_1_failing.output)
+ (deps .ocamlformat)
+ (action
+  (with-outputs-to
+   %{targets}
+   (system "! %{bin:ocamlformat} --root=. --max-iters=1 %{dep:sample/b.ml}"))))
 
 (alias
  (name runtest)

test/cli/roots/bad_version/dune-project

@@ -0,0 +1 @@
+(lang dune 1.11)

test/cli/roots/malformed1/dune-project

@@ -0,0 +1 @@
+(lang dune 1.11)

test/cli/roots/unknown_option/dune-project

@@ -0,0 +1 @@
+(lang dune 1.11)

test/cli/roots/unknown_value/dune-project

@@ -0,0 +1 @@
+(lang dune 1.11)

test/projects/dune

@@ -1,7 +1,7 @@
 (rule
  (targets enable_outside_detected_project.output)
  (deps enable_outside_detected_project/dune-project
-   enable_outside_detected_project/main.ml)
+   enable_outside_detected_project/main.ml .ocamlformat)
  (action
   (with-stdout-to
    %{targets}
@@ -17,7 +17,7 @@
 
 (rule
  (targets outside_detected_project.output)
- (deps outside_detected_project/dune-project outside_detected_project/main.ml)
+ (deps outside_detected_project/dune-project outside_detected_project/main.ml .ocamlformat)
  (action
   (with-outputs-to
    %{targets}

test/projects/enable_outside_detected_project.expected

@@ -1,3 +1,2 @@
-(* The following code should be formatted using OCamlformat's config and not
-   default *)
+(* The following code should be formatted using OCamlformat's config and not default *)
 type t = {foooooo: string; baaaaar: Baaaaar.t}