Fix the tests for Opam's sandbox

CHANGES.md

@@ -1,6 +1,6 @@
 merlin 4.3
 ===========
-Mon Jul 26 11:13:37 AM CET 2021
+Mon Jul 26 04:45:37 PM CET 2021
 
   + merlin binary
     - recover ill-typed patterns (#1317, #1342)
@@ -28,10 +28,10 @@ Mon Jul 26 11:13:37 AM CET 2021
     - locate: reset global state from all entry points (#1364)
     - Windows: replace user name by its SID in socketnames (#1345, @ttamttam)
   + editor modes
-    - vim: add a simple interface to the new `construct` command:
-      `MerlinConstruct`. When several results are suggested, 
-      `<c-i>` and `<c-u>`
-      to show more or less deep results. (#1318)
+    - vim: add a simple interface to the new `construct` command: 
+      `MerlinConstruct`. When several results are suggested, `<c-i>` 
+      and `<c-u>` can be use to change the depth of the recursive 
+      construction. (#1318)
     - vim: add support for the `merlin-locate-type` command:
       `MerlinLocateType` (#1359)
     - emacs: add a simple interface to the new `construct` command:
@@ -41,6 +41,7 @@ Mon Jul 26 11:13:37 AM CET 2021
         (#1367, @mattiase) 
   + test suite
     - cover the new `construct` command (#1318)
+    - disable tests failing in Opam's CI due to nested dune projects (#1373)
 
 merlin 4.2
 ==========

tests/test-dirs/config/dune

@@ -1,4 +1,8 @@
 (cram
- (applies_to symlinks path-expansion workdir)
+ (applies_to path-expansion)
  (enabled_if
   (<> %{os_type} Win32)))
+
+(cram
+ (applies_to symlinks workdir)
+ (enabled_if false))

tests/test-dirs/config/symlinks.t/run.t

@@ -1,5 +1,9 @@
   $ ROOT_DIR=$(pwd)
 
+  $ cat >real/dune-project <<EOF
+  > (lang dune 2.7)
+  > EOF
+
 We work in a directory which is a symlink to another
   $ ln -s real link
   $ cd link

tests/test-dirs/config/workdir.t/run.t

@@ -2,6 +2,15 @@ We need to set the MERLIN_LOG env variable for Merlin to log events prior
 to the reading of the configuration.
   $ export MERLIN_LOG=-
 
+  $ cat >dune-project <<EOF
+  > (lang dune 2.7)
+  > EOF
+
+  $ cat >src/dune <<EOF
+  > (executable
+  >  (name main))
+  > EOF
+
 % We check that:
 %   workdir = $TESTCASE_ROOT/src
 %   startdir = $TESTCASE_ROOT