From 4fc9ebdc487e18a308267401129725f9b8f8e8fe Mon Sep 17 00:00:00 2001 From: Ulysse <5031221+voodoos@users.noreply.github.com> Date: Mon, 15 Feb 2021 17:46:24 +0100 Subject: [PATCH] Fix test using default switch (#4232) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ulysse Gérard --- .../test-cases/merlin/github4125.t/dune-workspace | 9 --------- .../test-cases/merlin/github4125.t/run.t | 12 ++++++++++++ 2 files changed, 12 insertions(+), 9 deletions(-) delete mode 100644 test/blackbox-tests/test-cases/merlin/github4125.t/dune-workspace diff --git a/test/blackbox-tests/test-cases/merlin/github4125.t/dune-workspace b/test/blackbox-tests/test-cases/merlin/github4125.t/dune-workspace deleted file mode 100644 index f108e9c3d19..00000000000 --- a/test/blackbox-tests/test-cases/merlin/github4125.t/dune-workspace +++ /dev/null @@ -1,9 +0,0 @@ -(lang dune 2.0) - -(context (default)) - -(context - (opam - (name cross) - (switch default) - (merlin))) diff --git a/test/blackbox-tests/test-cases/merlin/github4125.t/run.t b/test/blackbox-tests/test-cases/merlin/github4125.t/run.t index 2e7926f4e01..46c49a9c6e8 100644 --- a/test/blackbox-tests/test-cases/merlin/github4125.t/run.t +++ b/test/blackbox-tests/test-cases/merlin/github4125.t/run.t @@ -1,3 +1,15 @@ +We call `$(opam switch show)` so that this test always uses an existing switch + + $ cat >dune-workspace < (lang dune 2.0) + > (context (default)) + > (context + > (opam + > (name cross) + > (switch $(opam switch show)) + > (merlin))) + > EOF + $ dune build $ ls -a _build/cross/.merlin-conf