merlin: update tests

Signed-off-by: Javier Chávarri <javier.chavarri@gmail.com>
ocaml · Mar 28, 2024 · 0c00e11 · 0c00e11
1 parent 3d3c97f
commit 0c00e11
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/test/blackbox-tests/test-cases/custom-cross-compilation/ppx-cross-context-issue.t/run.t b/test/blackbox-tests/test-cases/custom-cross-compilation/ppx-cross-context-issue.t/run.t
@@ -6,7 +6,8 @@
                         ^^^^^^
   Error: Library "fooppx" in _build/cross-environment/ppx is hidden
   (unsatisfied 'enabled_if').
-  -> required by _build/cross-environment/lib/lib.pp.ml
+  -> required by _build/cross-environment/lib/.merlin-conf/lib-foolib
+  -> required by _build/cross-environment/lib/foolib.a
   -> required by alias lib/all (context cross-environment)
   -> required by alias default (context cross-environment)
   [1]
diff --git a/test/blackbox-tests/test-cases/merlin/default-based-context.t/run.t b/test/blackbox-tests/test-cases/merlin/default-based-context.t/run.t
@@ -13,14 +13,20 @@ If Merlin field is absent, default context is chosen
 
   $ dune build
 
-  $ [ ! -d _build/cross/.merlin-conf ] && echo "No config in cross"
-  No config in cross
+The rules are generated for all contexts, regardless which one is chosen
+
+  $ ls -a _build/cross/.merlin-conf
+  .
+  ..
+  lib-foo
 
   $ ls -a _build/default/.merlin-conf
   .
   ..
   lib-foo
 
+But the default context is used by default
+
   $ dune ocaml merlin dump-config "$PWD"
   Foo: _build/default/foo
   ((STDLIB OPAM_PREFIX)
@@ -56,8 +62,10 @@ If Merlin field is present, this context is chosen
   ..
   lib-foo
 
-  $ [ ! -d _build/default/.merlin-conf ] && echo "No config in default"
-  No config in default
+  $ ls -a _build/default/.merlin-conf
+  .
+  ..
+  lib-foo
 
   $ dune ocaml merlin dump-config "$PWD"
   Foo: _build/cross/foo