From 307bccaebaee69c0db23088e25393a10f0cf9e89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ulysse=20G=C3=A9rard?= Date: Mon, 26 Jul 2021 13:47:34 +0200 Subject: [PATCH 1/3] Remove dune files from tests tree --- tests/test-dirs/config/symlinks.t/real/dune-project | 1 - tests/test-dirs/config/symlinks.t/run.t | 4 ++++ tests/test-dirs/config/workdir.t/dune-project | 1 - tests/test-dirs/config/workdir.t/run.t | 9 +++++++++ tests/test-dirs/config/workdir.t/src/dune | 2 -- 5 files changed, 13 insertions(+), 4 deletions(-) delete mode 100644 tests/test-dirs/config/symlinks.t/real/dune-project delete mode 100644 tests/test-dirs/config/workdir.t/dune-project delete mode 100644 tests/test-dirs/config/workdir.t/src/dune diff --git a/tests/test-dirs/config/symlinks.t/real/dune-project b/tests/test-dirs/config/symlinks.t/real/dune-project deleted file mode 100644 index 45acd3f088..0000000000 --- a/tests/test-dirs/config/symlinks.t/real/dune-project +++ /dev/null @@ -1 +0,0 @@ -(lang dune 2.7) diff --git a/tests/test-dirs/config/symlinks.t/run.t b/tests/test-dirs/config/symlinks.t/run.t index b58a416294..28546aa543 100644 --- a/tests/test-dirs/config/symlinks.t/run.t +++ b/tests/test-dirs/config/symlinks.t/run.t @@ -1,5 +1,9 @@ $ ROOT_DIR=$(pwd) + $ cat >real/dune-project < (lang dune 2.7) + > EOF + We work in a directory which is a symlink to another $ ln -s real link $ cd link diff --git a/tests/test-dirs/config/workdir.t/dune-project b/tests/test-dirs/config/workdir.t/dune-project deleted file mode 100644 index 45acd3f088..0000000000 --- a/tests/test-dirs/config/workdir.t/dune-project +++ /dev/null @@ -1 +0,0 @@ -(lang dune 2.7) diff --git a/tests/test-dirs/config/workdir.t/run.t b/tests/test-dirs/config/workdir.t/run.t index 0cb0b5f00e..662ebb8c57 100644 --- a/tests/test-dirs/config/workdir.t/run.t +++ b/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 < (lang dune 2.7) + > EOF + + $ cat >src/dune < (executable + > (name main)) + > EOF + % We check that: % workdir = $TESTCASE_ROOT/src % startdir = $TESTCASE_ROOT diff --git a/tests/test-dirs/config/workdir.t/src/dune b/tests/test-dirs/config/workdir.t/src/dune deleted file mode 100644 index 69dd4adeac..0000000000 --- a/tests/test-dirs/config/workdir.t/src/dune +++ /dev/null @@ -1,2 +0,0 @@ -(executable - (name main)) From 42d0c1efedd9a2d3797251c3f26b8df0799ec275 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ulysse=20G=C3=A9rard?= Date: Mon, 26 Jul 2021 16:16:02 +0200 Subject: [PATCH 2/3] Temporary disable workdir and symlinks tests --- tests/test-dirs/config/dune | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tests/test-dirs/config/dune b/tests/test-dirs/config/dune index 38d9774679..3afbf37cb4 100755 --- a/tests/test-dirs/config/dune +++ b/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)) From 3abd72bf7ed93488259db9dc9c24d4566007ce9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ulysse=20G=C3=A9rard?= Date: Mon, 26 Jul 2021 16:19:34 +0200 Subject: [PATCH 3/3] Update and fix changelog --- CHANGES.md | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 17b6f41810..36a3268c77 100644 --- a/CHANGES.md +++ b/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, - `` and `` - to show more or less deep results. (#1318) + - vim: add a simple interface to the new `construct` command: + `MerlinConstruct`. When several results are suggested, `` + and `` 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 ==========