From 6fd6463a857254165942931bce6d17a2054804c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Ch=C3=A1varri?= Date: Tue, 2 Apr 2024 06:27:41 +0000 Subject: [PATCH] merlin: roll back changes in default-based-context test 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 | 14 ++++---------- 1 file changed, 4 insertions(+), 10 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 e4679dc2cd25..5067bccf6e58 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,20 +13,15 @@ If Merlin field is absent, default context is chosen $ dune build -The rules are generated for all contexts, regardless which one is chosen - $ ls -a _build/cross/.merlin-conf - . - .. - lib-foo + ls: cannot access '_build/cross/.merlin-conf': No such file or directory + [2] $ 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) @@ -63,9 +58,8 @@ If Merlin field is present, this context is chosen lib-foo $ ls -a _build/default/.merlin-conf - . - .. - lib-foo + ls: cannot access '_build/default/.merlin-conf': No such file or directory + [2] $ dune ocaml merlin dump-config "$PWD" Foo: _build/cross/foo