fixes to tests

Signed-off-by: Sudha Parimala <[email protected]>

Author: Sudha247

doc/changes/fixed/12834.md

@@ -7,7 +7,7 @@ a lockdir containing an "ocaml" lockfile.
 
   $ mkrepo
   $ make_mock_merlin_package
-  $ mkpkg ocaml 5.2.0
+  $ mk_ocaml 5.2.0
 
   $ setup_merlin_workspace
 
@@ -16,17 +16,17 @@ a lockdir containing an "ocaml" lockfile.
   > 
   > (package
   >  (name foo)
-  >  (allow_empty))
+  >  (allow_empty)
+  >  (depends
+  >    (ocaml (= 5.2.0))))
   > EOF
 
-  $ make_lockdir
-  $ make_lockpkg ocaml <<EOF
-  > (version 5.2.0)
-  > EOF
+  $ dune build
 
   $ dune tools exec ocamlmerlin
   Solution for _build/.dev-tools.locks/merlin:
   - merlin.0.0.1
-  - ocaml.5.2.0
+  - ocaml-base-compiler.5.2.0
+  - ocaml-compiler.5.2.0
        Running 'ocamlmerlin'
   hello from fake ocamlmerlin

test/blackbox-tests/test-cases/pkg/merlin/dev-tool-merlin-basic.t

@@ -6,7 +6,7 @@ executable in PATH is the one installed by dune as a dev tool.
 
   $ mkrepo
   $ make_mock_merlin_package
-  $ mkpkg ocaml 5.2.0
+  $ mk_ocaml 5.2.0
 
   $ setup_merlin_workspace
 
@@ -15,19 +15,19 @@ executable in PATH is the one installed by dune as a dev tool.
   > 
   > (package
   >  (name foo)
-  >  (allow_empty))
+  >  (allow_empty)
+  >  (depends
+  >    (ocaml (= 5.2.0))))
   > EOF
 
-  $ make_lockdir
-  $ make_lockpkg ocaml <<EOF
-  > (version 5.2.0)
-  > EOF
+  $ dune build
 
 First install the tool:
   $ dune tools exec ocamlmerlin
   Solution for _build/.dev-tools.locks/merlin:
   - merlin.0.0.1
-  - ocaml.5.2.0
+  - ocaml-base-compiler.5.2.0
+  - ocaml-compiler.5.2.0
        Running 'ocamlmerlin'
   hello from fake ocamlmerlin
 

test/blackbox-tests/test-cases/pkg/merlin/dev-tool-merlin-env.t

@@ -9,8 +9,8 @@ same version of the ocaml compiler as the code that it's analyzing.
 
   $ mkrepo
   $ make_mock_merlin_package
-  $ mkpkg ocaml 5.2.0
-  $ mkpkg ocaml 5.1.0
+  $ mk_ocaml 5.2.0
+  $ mk_ocaml 5.1.0
 
   $ setup_merlin_workspace
 
@@ -19,44 +19,64 @@ same version of the ocaml compiler as the code that it's analyzing.
   > 
   > (package
   >  (name foo)
-  >  (allow_empty))
+  >  (allow_empty)
+  >  (depends
+  >  (ocaml (= 5.2.0))))
   > EOF
 
-  $ make_lockdir
-  $ make_lockpkg ocaml <<EOF
-  > (version 5.2.0)
-  > EOF
+  $ dune build
+
+Initially merlin will depend on ocaml-base-compiler.5.2.0 to match the project.
 
-Initially merlin will depend on ocaml.5.2.0 to match the project.
   $ dune tools exec ocamlmerlin
   Solution for _build/.dev-tools.locks/merlin:
   - merlin.0.0.1
-  - ocaml.5.2.0
+  - ocaml-base-compiler.5.2.0
+  - ocaml-compiler.5.2.0
        Running 'ocamlmerlin'
   hello from fake ocamlmerlin
-  $ cat "${dev_tool_lock_dir}"/ocaml.pkg
+  $ grep "version" "${dev_tool_lock_dir}"/ocaml-base-compiler.pkg
   (version 5.2.0)
 
 We can re-run "dune tools exec ocamlmerlin" without relocking or rebuilding.
   $ dune tools exec ocamlmerlin
+  The version of the compiler package ("ocaml-base-compiler") in this project's
+  lockdir has changed to 5.2.0 (formerly the compiler version was 5.2.0). The
+  dev-tool "merlin" will be re-locked and rebuilt with this version of the
+  compiler.
+  Solution for _build/.dev-tools.locks/merlin:
+  - merlin.0.0.1
+  - ocaml-base-compiler.5.2.0
+  - ocaml-compiler.5.2.0
        Running 'ocamlmerlin'
   hello from fake ocamlmerlin
 
 Change the version of ocaml that the project depends on.
-  $ make_lockpkg ocaml <<EOF
-  > (version 5.1.0)
+
+  $ cat > dune-project <<EOF
+  > (lang dune 3.16)
+  > 
+  > (package
+  >  (name foo)
+  >  (allow_empty)
+  >  (depends
+  >  (ocaml (= 5.1.0))))
   > EOF
 
+  $ dune build
+
 Running "dune tools exec ocamlmerlin" causes merlin to be relocked and rebuilt
 before running. Merlin now depends on ocaml.5.1.0.
   $ dune tools exec ocamlmerlin
-  The version of the compiler package ("ocaml") in this project's lockdir has
-  changed to 5.1.0 (formerly the compiler version was 5.2.0). The dev-tool
-  "merlin" will be re-locked and rebuilt with this version of the compiler.
+  The version of the compiler package ("ocaml-base-compiler") in this project's
+  lockdir has changed to 5.1.0 (formerly the compiler version was 5.2.0). The
+  dev-tool "merlin" will be re-locked and rebuilt with this version of the
+  compiler.
   Solution for _build/.dev-tools.locks/merlin:
   - merlin.0.0.1
-  - ocaml.5.1.0
+  - ocaml-base-compiler.5.1.0
+  - ocaml-compiler.5.1.0
        Running 'ocamlmerlin'
   hello from fake ocamlmerlin
-  $ cat "${dev_tool_lock_dir}"/ocaml.pkg
+  $ grep "version" "${dev_tool_lock_dir}"/ocaml-base-compiler.pkg
   (version 5.1.0)

test/blackbox-tests/test-cases/pkg/merlin/dev-tool-merlin-relock-on-ocaml-version-change.t

@@ -26,7 +26,7 @@ same version of the ocaml compiler as the code that it's analyzing.
 
   $ dune build
 
-Initially ocamllsp will be depend on ocaml.5.2.0 to match the project.
+Initially ocamllsp will depend on ocaml-base-compiler.5.2.0 to match the project.
   $ dune tools exec ocamllsp
   Solution for _build/.dev-tools.locks/ocaml-lsp-server:
   - ocaml-base-compiler.5.2.0

test/blackbox-tests/test-cases/pkg/ocamllsp/dev-tool-ocamllsp-relock-on-ocaml-version-change.t

@@ -17,8 +17,7 @@ a lockdir containing an "ocaml" lockfile.
   >  (name foo)
   >  (allow_empty)
   >  (depends
-  >  (ocaml (= 5.2.0))
-  >  (ocaml-base-compiler (= 5.2.0))))
+  >    (ocaml (= 5.2.0))))
   > EOF
 
   $ dune build

test/blackbox-tests/test-cases/pkg/odoc/dev-tool-odoc-basic.t

@@ -21,13 +21,12 @@ same version of the ocaml compiler as the code that it's analyzing.
   >  (name foo)
   >  (allow_empty)
   >  (depends
-  >  (ocaml (= 5.2.0))
-  >  (ocaml-base-compiler (= 5.2.0))))
+  >  (ocaml (= 5.2.0))))
   > EOF
 
   $ dune build
 
-Initially odoc will be depend on ocaml.5.2.0 to match the project.
+Initially odoc will depend on ocaml-base-compiler.5.2.0 to match the project.
   $ DUNE_CONFIG__LOCK_DEV_TOOL=enabled dune ocaml doc
   Solution for _build/.dev-tools.locks/odoc:
   - ocaml-base-compiler.5.2.0
@@ -71,8 +70,7 @@ Change the version of ocaml that the project depends on.
   >  (name foo)
   >  (allow_empty)
   >  (depends
-  >  (ocaml (= 5.1.0))
-  >  (ocaml-base-compiler (= 5.1.0))))
+  >  (ocaml (= 5.1.0))))
   > EOF
 
   $ dune build