From b174a615c92a08cfd683686b0e119106d0bc47f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Ch=C3=A1varri?= Date: Thu, 28 Mar 2024 10:38:11 +0000 Subject: [PATCH] merlin: update tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Javier Chávarri --- .../merlin/default-based-context.t/run.t | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) 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 index d29e5ee4eeee..c6a3b81728f4 100644 --- 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