From a2d82102b587178a7d0bb960b08561109adcde6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ulysse=20G=C3=A9rard?= <thevoodoos@gmail.com>
Date: Thu, 5 Dec 2024 16:59:18 +0100
Subject: [PATCH] Pormote updated tests

---
 .../tests-dirs/local-shape-and-include.t      |  4 +--
 .../in-implicit-trans-dep.t/dune-project      |  2 +-
 .../locate/in-implicit-trans-dep.t/run.t      |  9 +++---
 tests/test-dirs/search/search-by-type.t/run.t | 32 +++++++++----------
 .../test-dirs/type-enclosing/inside-tydecl.t  |  2 +-
 tests/test-dirs/type-enclosing/issue1335.t    |  6 ++--
 tests/test-dirs/type-enclosing/issue1755.t    |  4 +--
 7 files changed, 30 insertions(+), 29 deletions(-)

diff --git a/src/ocaml-index/tests/tests-dirs/local-shape-and-include.t b/src/ocaml-index/tests/tests-dirs/local-shape-and-include.t
index 120db8e512..1111fef1db 100644
--- a/src/ocaml-index/tests/tests-dirs/local-shape-and-include.t
+++ b/src/ocaml-index/tests/tests-dirs/local-shape-and-include.t
@@ -33,7 +33,7 @@
    uid: Main.3; locs: "g": File "main.ml", line 9, characters 6-7
    uid: Main.4; locs: "g": File "main.ml", line 3, characters 6-7
    uid: Main.5; locs: "B": File "main.ml", line 2, characters 7-8
-   uid: Stdlib__String.173; locs:
+   uid: Stdlib__String.174; locs:
      "String.equal": File "main.ml", line 1, characters 8-20
    }, 0 approx shapes: {}, and shapes for CUS .
 
@@ -50,7 +50,7 @@
    uid: Main.3; locs: "g": File "main.ml", line 9, characters 6-7
    uid: Main.4; locs: "g": File "main.ml", line 3, characters 6-7
    uid: Main.5; locs: "B": File "main.ml", line 2, characters 7-8
-   uid: Stdlib__String.173; locs:
+   uid: Stdlib__String.174; locs:
      "String.equal": File "main.ml", line 1, characters 8-20
    }, 0 approx shapes: {}, and shapes for CUS .
 
diff --git a/tests/test-dirs/locate/in-implicit-trans-dep.t/dune-project b/tests/test-dirs/locate/in-implicit-trans-dep.t/dune-project
index ad5a865f69..fff9b78b84 100644
--- a/tests/test-dirs/locate/in-implicit-trans-dep.t/dune-project
+++ b/tests/test-dirs/locate/in-implicit-trans-dep.t/dune-project
@@ -1,2 +1,2 @@
-(lang dune 2.0)
+(lang dune 3.17)
 (implicit_transitive_deps false)
diff --git a/tests/test-dirs/locate/in-implicit-trans-dep.t/run.t b/tests/test-dirs/locate/in-implicit-trans-dep.t/run.t
index 0301d8ed39..9ac1be8fb9 100644
--- a/tests/test-dirs/locate/in-implicit-trans-dep.t/run.t
+++ b/tests/test-dirs/locate/in-implicit-trans-dep.t/run.t
@@ -1,8 +1,9 @@
-  $ dune build @check
+  $ dune build @check 2>/dev/null
+  [1]
 
-When the deifinition is in one of the implicit transitive dependencies
-Merlin does not found the file in the source path provided by Dune. One possible
-fix would be for Dune to provide additional source path for "externatl" deps.
+When the definition is in one of the implicit transitive dependencies
+Merlin does not found the file in the source path provided by Dune. 
+This works as expected since Dune lang 3.17 and OCaml >= 5.2
   $ $MERLIN single locate -look-for ml -position 1:15 \
   > -filename bin/main.ml <bin/main.ml
   {
diff --git a/tests/test-dirs/search/search-by-type.t/run.t b/tests/test-dirs/search/search-by-type.t/run.t
index 06b4a4da4d..8bfee4acfa 100644
--- a/tests/test-dirs/search/search-by-type.t/run.t
+++ b/tests/test-dirs/search/search-by-type.t/run.t
@@ -136,11 +136,11 @@
       {
         "file": "hashtbl.mli",
         "start": {
-          "line": 116,
+          "line": 117,
           "col": 0
         },
         "end": {
-          "line": 116,
+          "line": 117,
           "col": 40
         },
         "name": "Hashtbl.add",
@@ -152,11 +152,11 @@
       {
         "file": "hashtbl.mli",
         "start": {
-          "line": 151,
+          "line": 152,
           "col": 0
         },
         "end": {
-          "line": 151,
+          "line": 152,
           "col": 44
         },
         "name": "Hashtbl.replace",
@@ -168,11 +168,11 @@
       {
         "file": "hashtbl.mli",
         "start": {
-          "line": 301,
+          "line": 302,
           "col": 0
         },
         "end": {
-          "line": 301,
+          "line": 302,
           "col": 50
         },
         "name": "Hashtbl.add_seq",
@@ -184,11 +184,11 @@
       {
         "file": "hashtbl.mli",
         "start": {
-          "line": 305,
+          "line": 306,
           "col": 0
         },
         "end": {
-          "line": 305,
+          "line": 306,
           "col": 54
         },
         "name": "Hashtbl.replace_seq",
@@ -218,11 +218,11 @@
       {
         "file": "moreLabels.mli",
         "start": {
-          "line": 133,
+          "line": 134,
           "col": 2
         },
         "end": {
-          "line": 133,
+          "line": 134,
           "col": 51
         },
         "name": "MoreLabels.Hashtbl.add",
@@ -234,11 +234,11 @@
       {
         "file": "moreLabels.mli",
         "start": {
-          "line": 318,
+          "line": 319,
           "col": 2
         },
         "end": {
-          "line": 318,
+          "line": 319,
           "col": 52
         },
         "name": "MoreLabels.Hashtbl.add_seq",
@@ -250,11 +250,11 @@
       {
         "file": "moreLabels.mli",
         "start": {
-          "line": 168,
+          "line": 169,
           "col": 2
         },
         "end": {
-          "line": 168,
+          "line": 169,
           "col": 55
         },
         "name": "MoreLabels.Hashtbl.replace",
@@ -266,11 +266,11 @@
       {
         "file": "moreLabels.mli",
         "start": {
-          "line": 322,
+          "line": 323,
           "col": 2
         },
         "end": {
-          "line": 322,
+          "line": 323,
           "col": 56
         },
         "name": "MoreLabels.Hashtbl.replace_seq",
diff --git a/tests/test-dirs/type-enclosing/inside-tydecl.t b/tests/test-dirs/type-enclosing/inside-tydecl.t
index af594fb4a8..2fda8883cc 100644
--- a/tests/test-dirs/type-enclosing/inside-tydecl.t
+++ b/tests/test-dirs/type-enclosing/inside-tydecl.t
@@ -29,7 +29,7 @@ test
           "line": 1,
           "col": 20
         },
-        "type": "type t1 = 'a",
+        "type": "type t1 = t1",
         "tail": "no"
       },
       {
diff --git a/tests/test-dirs/type-enclosing/issue1335.t b/tests/test-dirs/type-enclosing/issue1335.t
index 2738acdffe..99cafcb8ea 100644
--- a/tests/test-dirs/type-enclosing/issue1335.t
+++ b/tests/test-dirs/type-enclosing/issue1335.t
@@ -24,7 +24,7 @@ provide better result.
           "line": 4,
           "col": 15
         },
-        "type": "type 'a t = 'b",
+        "type": "type 'a t = 'b t",
         "tail": "no"
       },
       {
@@ -36,7 +36,7 @@ provide better result.
           "line": 4,
           "col": 15
         },
-        "type": "'a",
+        "type": "'k t",
         "tail": "no"
       },
       {
@@ -77,7 +77,7 @@ provide better result.
           "line": 1,
           "col": 25
         },
-        "type": "[ `A of 'a | `B ]",
+        "type": "[ `A of t1 | `B ]",
         "tail": "no"
       },
       {
diff --git a/tests/test-dirs/type-enclosing/issue1755.t b/tests/test-dirs/type-enclosing/issue1755.t
index 2a22de8324..a8a3262781 100644
--- a/tests/test-dirs/type-enclosing/issue1755.t
+++ b/tests/test-dirs/type-enclosing/issue1755.t
@@ -21,7 +21,7 @@ provide better result.
           "line": 1,
           "col": 25
         },
-        "type": "type b = 'a",
+        "type": "type b = b",
         "tail": "no"
       },
       {
@@ -33,7 +33,7 @@ provide better result.
           "line": 1,
           "col": 25
         },
-        "type": "'a",
+        "type": "b",
         "tail": "no"
       },
       {