Fix tests not passing in Opam (#2635)

Bug introduced in #2618. The tests don't pass when run with `dune build -p` option, as it's done in Opam.
ocaml-ppx · Nov 29, 2024 · e2bd0c5 · e2bd0c5
1 parent 70830b5
commit e2bd0c5
Show file tree

Hide file tree

Showing 8 changed files with 1,258 additions and 316 deletions.
diff --git a/test/passing/gen/dune.inc b/test/passing/gen/dune.inc
diff --git a/test/passing/gen/gen.ml b/test/passing/gen/gen.ml
@@ -106,18 +106,21 @@ let emit_test test_name setup =
   Printf.printf
     {|
 (rule
- (deps .ocamlformat dune-project)%s
+ (deps .ocamlformat .hg)%s
+ (package ocamlformat)
  (action
   (with-stdout-to %s
    (with-stderr-to %s.stderr
      %s))))
 
 (rule
  (alias runtest)%s
+ (package ocamlformat)
  (action (diff %s %s.stdout)))
 
 (rule
  (alias runtest)%s
+ (package ocamlformat)
  (action (diff %s %s.stderr)))
 |}
     enabled_if_line output_fname test_name

diff --git a/test/passing/refs.default/.hg b/test/passing/refs.default/.hg
@@ -0,0 +1,2 @@
+This file ensures that OCamlformat don't consider parent directories when
+searching for configuration.
diff --git a/test/passing/refs.default/dune-project b/test/passing/refs.default/dune-project
diff --git a/test/passing/refs.janestreet/.hg b/test/passing/refs.janestreet/.hg
@@ -0,0 +1,2 @@
+This file ensures that OCamlformat don't consider parent directories when
+searching for configuration.
diff --git a/test/passing/refs.janestreet/dune-project b/test/passing/refs.janestreet/dune-project
diff --git a/test/passing/refs.ocamlformat/.hg b/test/passing/refs.ocamlformat/.hg
@@ -0,0 +1,2 @@
+This file ensures that OCamlformat don't consider parent directories when
+searching for configuration.
diff --git a/test/passing/refs.ocamlformat/dune-project b/test/passing/refs.ocamlformat/dune-project
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		This file ensures that OCamlformat don't consider parent directories when
		searching for configuration.