Move dev-tool lock dirs into hidden folder

Leonidas-from-XIV · Leonidas-from-XIV · commit d4ddf5bb8db0 · 2025-11-06T11:05:57.000+01:00
Signed-off-by: Marek Kubica &lt;marek@tarides.com&gt;
diff --git a/src/dune_rules/lock_dir.ml b/src/dune_rules/lock_dir.ml
@@ -148,7 +148,7 @@ let dev_tool_to_path_segment dev_tool =
 ;;
 
 let dev_tool_source_lock_dir dev_tool =
-  let dev_tools_path = Path.Source.(relative root "dev-tools.locks") in
+  let dev_tools_path = Path.Source.(relative root ".dev-tools.locks") in
   let dev_tool_segment = dev_tool_to_path_segment dev_tool in
   Path.Source.append_local dev_tools_path dev_tool_segment
 ;;
diff --git a/src/dune_rules/pkg_rules.ml b/src/dune_rules/pkg_rules.ml
@@ -1534,7 +1534,7 @@ end = struct
               [ "dir", Path.External.to_dyn e ]
           | In_source_tree s ->
             (match Path.Source.explode s with
-             | [ "dev-tools.locks"; dev_tool; files_dir ] ->
+             | [ ".dev-tools.locks"; dev_tool; files_dir ] ->
                Path.Build.L.relative
                  Private_context.t.build_dir
                  [ "default"; ".dev-tool-locks"; dev_tool; files_dir ]
diff --git a/test/blackbox-tests/test-cases/pkg/ocamlformat/gh10991.t b/test/blackbox-tests/test-cases/pkg/ocamlformat/gh10991.t
@@ -19,7 +19,7 @@ Initial file:
   let () = print_endline "Hello, world"
 
   $ DUNE_CONFIG__LOCK_DEV_TOOL=enabled dune fmt
-  Solution for dev-tools.locks/ocamlformat:
+  Solution for .dev-tools.locks/ocamlformat:
   - ocamlformat.0.0.1
   File "foo.ml", line 1, characters 0-0:
   Error: Files _build/default/foo.ml and _build/default/.formatted/foo.ml
diff --git a/test/blackbox-tests/test-cases/pkg/ocamlformat/gh11037.t b/test/blackbox-tests/test-cases/pkg/ocamlformat/gh11037.t
@@ -40,7 +40,7 @@ attempt to build the package "foo".
   $ cat foo.ml
   let () = print_endline "Hello, world"
   $ DUNE_CONFIG__LOCK_DEV_TOOL=enabled dune fmt
-  Solution for dev-tools.locks/ocamlformat:
+  Solution for .dev-tools.locks/ocamlformat:
   - ocamlformat.0.0.1
   File "foo.ml", line 1, characters 0-0:
   Error: Files _build/default/foo.ml and _build/default/.formatted/foo.ml
diff --git a/test/blackbox-tests/test-cases/pkg/ocamlformat/helpers.sh b/test/blackbox-tests/test-cases/pkg/ocamlformat/helpers.sh
@@ -1,5 +1,7 @@
 . ../helpers.sh
 
+dev_tool_lock_dir=".dev-tools.locks/ocamlformat"
+
 make_fake_ocamlformat() {
   version=$1
   if [ "$#" -eq "1" ]
@@ -97,7 +99,7 @@ EOF
 (lang dune 3.20)
 
 (lock_dir
- (path "dev-tools.locks/ocamlformat")
+ (path "${dev_tool_lock_dir}")
  (repositories mock))
 
 (lock_dir
diff --git a/test/blackbox-tests/test-cases/pkg/ocamlformat/ocamlformat-avoid-conflict-with-project.t b/test/blackbox-tests/test-cases/pkg/ocamlformat/ocamlformat-avoid-conflict-with-project.t
@@ -29,7 +29,7 @@ Add a fake executable in the PATH
 
 Build the OCamlFormat binary dev-tool
   $ DUNE_CONFIG__LOCK_DEV_TOOL=enabled dune fmt --preview
-  Solution for dev-tools.locks/ocamlformat:
+  Solution for .dev-tools.locks/ocamlformat:
   - ocamlformat.0.26.2
   File "dune", line 1, characters 0-0:
   Error: Files _build/default/dune and _build/default/.formatted/dune differ.
diff --git a/test/blackbox-tests/test-cases/pkg/ocamlformat/ocamlformat-avoid-taking-from-project-deps.t b/test/blackbox-tests/test-cases/pkg/ocamlformat/ocamlformat-avoid-taking-from-project-deps.t
@@ -45,7 +45,7 @@ Format using the dev-tools feature, it does not invoke the OCamlFormat binary fr
 the project dependencies (0.26.2) but instead builds and runs the OCamlFormat binary as a
 dev-tool (0.26.3).
   $ DUNE_CONFIG__LOCK_DEV_TOOL=enabled dune fmt
-  Solution for dev-tools.locks/ocamlformat:
+  Solution for .dev-tools.locks/ocamlformat:
   - ocamlformat.0.26.3
   File "foo.ml", line 1, characters 0-0:
   Error: Files _build/default/foo.ml and _build/default/.formatted/foo.ml
@@ -59,7 +59,7 @@ Retry, without dev-tools feature and without cleaning. This time it uses the OCa
 binary from the project dependencies rather than the dev-tool. This exercises the
 behavior when OCamlFormat is installed simultaneously as both a dev-tool and as a
 regular package dependency.
-  $ rm -rf dev-tools.locks/ocamlformat
+  $ rm -r "${dev_tool_lock_dir}"
   $ dune fmt --preview
   File "foo.ml", line 1, characters 0-0:
   Error: Files _build/default/foo.ml and _build/default/.formatted/foo.ml
diff --git a/test/blackbox-tests/test-cases/pkg/ocamlformat/ocamlformat-dev-tool-deps-conflict-project-deps.t b/test/blackbox-tests/test-cases/pkg/ocamlformat/ocamlformat-dev-tool-deps-conflict-project-deps.t
@@ -94,7 +94,7 @@ It shows that the project uses printer.2.0
 Format foo.ml, "dune fmt" uses printer.1.0 instead. There is no conflict with different
 versions of the same dependency.
   $ DUNE_CONFIG__LOCK_DEV_TOOL=enabled dune fmt --preview
-  Solution for dev-tools.locks/ocamlformat:
+  Solution for .dev-tools.locks/ocamlformat:
   - ocamlformat.0.26.2
   - printer.1.0
   File "foo.ml", line 1, characters 0-0:
diff --git a/test/blackbox-tests/test-cases/pkg/ocamlformat/ocamlformat-dev-tool-fails-to-build.t b/test/blackbox-tests/test-cases/pkg/ocamlformat/ocamlformat-dev-tool-fails-to-build.t
@@ -13,7 +13,7 @@ Make dune-project that uses the mocked dev-tool opam-reposiotry.
 
 It fails during the build because of missing OCamlFormat module.
   $ DUNE_CONFIG__LOCK_DEV_TOOL=enabled dune fmt
-  Solution for dev-tools.locks/ocamlformat:
+  Solution for .dev-tools.locks/ocamlformat:
   - ocamlformat.0.26.4
   File "dev-tools.locks/ocamlformat/ocamlformat.pkg", line 4, characters 6-10:
   4 |  (run dune build -p %{pkg-self:name} @install))
diff --git a/test/blackbox-tests/test-cases/pkg/ocamlformat/ocamlformat-e2e.t b/test/blackbox-tests/test-cases/pkg/ocamlformat/ocamlformat-e2e.t
@@ -25,7 +25,7 @@ Make dune-project that uses the mocked dev-tool opam-reposiotry.
 Without a ".ocamlformat" file, "dune fmt" takes the latest version of
 OCamlFormat.
   $ DUNE_CONFIG__LOCK_DEV_TOOL=enabled dune fmt --preview
-  Solution for dev-tools.locks/ocamlformat:
+  Solution for .dev-tools.locks/ocamlformat:
   - ocamlformat.0.26.3
   File "foo.ml", line 1, characters 0-0:
   Error: Files _build/default/foo.ml and _build/default/.formatted/foo.ml
@@ -40,13 +40,13 @@ Create .ocamlformat file
   > EOF
 
 An important cleaning here, "dune fmt" will relock and build the new version(0.26.2) of OCamlFormat.
-  $ rm -r dev-tools.locks/ocamlformat
+  $ rm -r "${dev_tool_lock_dir}"
   $ dune clean
 
 With a ".ocamlformat" file, "dune fmt" takes the version mentioned inside ".ocamlformat"
 file.
   $ DUNE_CONFIG__LOCK_DEV_TOOL=enabled dune fmt --preview
-  Solution for dev-tools.locks/ocamlformat:
+  Solution for .dev-tools.locks/ocamlformat:
   - ocamlformat.0.26.2
   File "foo.ml", line 1, characters 0-0:
   Error: Files _build/default/foo.ml and _build/default/.formatted/foo.ml
@@ -64,10 +64,11 @@ Formating a second time would not trigger the lock/solve.
   $ cat _build/default/.formatted/foo.ml
   formatted with version 0.26.2
 
-When "dev-tools.locks" is removed, the solving/lock is renewed
-  $ rm -r dev-tools.locks/ocamlformat
+When the lock dir is removed, the solving/lock is renewed:
+
+  $ rm -r "${dev_tool_lock_dir}"
   $ DUNE_CONFIG__LOCK_DEV_TOOL=enabled dune fmt --preview
-  Solution for dev-tools.locks/ocamlformat:
+  Solution for .dev-tools.locks/ocamlformat:
   - ocamlformat.0.26.2
   File "foo.ml", line 1, characters 0-0:
   Error: Files _build/default/foo.ml and _build/default/.formatted/foo.ml
diff --git a/test/blackbox-tests/test-cases/pkg/ocamlformat/ocamlformat-ignore.t b/test/blackbox-tests/test-cases/pkg/ocamlformat/ocamlformat-ignore.t
@@ -28,7 +28,7 @@ Create ".ocamlformat-ignore"
 
 Check with the feature when ".ocamlformat-ignore" file exists.
   $ DUNE_CONFIG__LOCK_DEV_TOOL=enabled dune fmt --preview
-  Solution for dev-tools.locks/ocamlformat:
+  Solution for .dev-tools.locks/ocamlformat:
   - ocamlformat.0.26.2
   File "foo.ml", line 1, characters 0-0:
   Error: Files _build/default/foo.ml and _build/default/.formatted/foo.ml
@@ -42,7 +42,7 @@ Check with the feature when ".ocamlformat-ignore" file exists.
 
 An important cleaning here, "dune fmt" takes the dev-tool when the lock directory
 exists even if the dev-tool feature is disabled.
-  $ rm -r dev-tools.locks/ocamlformat
+  $ rm -r "${dev_tool_lock_dir}"
 
 Check without the feature when ".ocamlformat-ignore" file exists.
   $ DUNE_CONFIG__LOCK_DEV_TOOL=disabled dune fmt
diff --git a/test/blackbox-tests/test-cases/pkg/ocamlformat/ocamlformat-install.t b/test/blackbox-tests/test-cases/pkg/ocamlformat/ocamlformat-install.t
@@ -8,7 +8,7 @@ Test `dune tools which ocamlformat`:
 
 Install ocamlformat as a dev tool:
   $ dune tools install ocamlformat
-  Solution for dev-tools.locks/ocamlformat:
+  Solution for .dev-tools.locks/ocamlformat:
   - ocamlformat.0.26.2
 
 Verify that ocamlformat is installed:
diff --git a/test/blackbox-tests/test-cases/pkg/ocamlformat/ocamlformat-patch-extra-files.t b/test/blackbox-tests/test-cases/pkg/ocamlformat/ocamlformat-patch-extra-files.t
@@ -1,7 +1,7 @@
-'dune fmt' produce lock files inside "dev-tools.locks/ocamlformat" before it starts building
+'dune fmt' produces lock files inside the dev tool lock directory before it starts building
 ocamlformat and its dependencies during the same run of the "dune fmt" command. The source tree is
 loaded before the lock files are produced, this is why any 'patch' file inside
-'dev-tools.locks/ocmalformat' is not copied inside the 'build' directory when a rule depends on it.
+the dev tool lock dir is not copied inside the 'build' directory when a rule depends on it.
 
 The issue was that there is a rule that depends on an 'patch' file in order to copy the file
 inside '_private/default/..' directory, since the file could not be copied, the rule is not activated.
@@ -61,7 +61,7 @@ Make a project that uses the fake ocamlformat:
 
 First run of 'dune fmt' is supposed to format the fail.
   $ DUNE_CONFIG__LOCK_DEV_TOOL=enabled dune fmt
-  Solution for dev-tools.locks/ocamlformat:
+  Solution for .dev-tools.locks/ocamlformat:
   - ocamlformat.0.26.2
   File "foo.ml", line 1, characters 0-0:
   Error: Files _build/default/foo.ml and _build/default/.formatted/foo.ml
diff --git a/test/blackbox-tests/test-cases/pkg/ocamlformat/ocamlformat-relaxed-version-constraints.t b/test/blackbox-tests/test-cases/pkg/ocamlformat/ocamlformat-relaxed-version-constraints.t
@@ -28,7 +28,7 @@ Initial file:
 This should choose the 0.24+foo version:
   $ echo "version=0.24" > .ocamlformat
   $ DUNE_CONFIG__LOCK_DEV_TOOL=enabled dune fmt
-  Solution for dev-tools.locks/ocamlformat:
+  Solution for .dev-tools.locks/ocamlformat:
   - ocamlformat.0.24+foo
   File "foo.ml", line 1, characters 0-0:
   Error: Files _build/default/foo.ml and _build/default/.formatted/foo.ml
@@ -41,9 +41,9 @@ This should choose the 0.24+foo version:
 
 This should choose the 0.24+bar version:
   $ echo "version=0.25" > .ocamlformat
-  $ rm -rf dev-tools.locks
+  $ rm -r "${dev_tool_lock_dir}"
   $ DUNE_CONFIG__LOCK_DEV_TOOL=enabled dune fmt
-  Solution for dev-tools.locks/ocamlformat:
+  Solution for .dev-tools.locks/ocamlformat:
   - ocamlformat.0.25+bar
   File "foo.ml", line 1, characters 0-0:
   Error: Files _build/default/foo.ml and _build/default/.formatted/foo.ml
@@ -57,10 +57,10 @@ This should choose the 0.24+bar version:
 
 This should fail as there is no version matching 0.24.1:
   $ echo "version=0.24.1" > .ocamlformat
-  $ rm -rf dev-tools.locks
+  $ rm -r "${dev_tool_lock_dir}"
   $ DUNE_CONFIG__LOCK_DEV_TOOL=enabled dune fmt
   Error: Unable to solve dependencies for the following lock directories:
-  Lock directory dev-tools.locks/ocamlformat:
+  Lock directory .dev-tools.locks/ocamlformat:
   Couldn't solve the package dependency formula.
   Selected candidates: ocamlformat_dev_tool_wrapper.dev
   - ocamlformat -> (problem)
diff --git a/test/blackbox-tests/test-cases/pkg/ocamlformat/ocamlformat-relock-on-corrupt-lockdir.t b/test/blackbox-tests/test-cases/pkg/ocamlformat/ocamlformat-relock-on-corrupt-lockdir.t
@@ -12,17 +12,17 @@ Make a fake ocamlformat package
 
 Install ocamlformat once to generate the lockdir.
   $ dune tools install ocamlformat
-  Solution for dev-tools.locks/ocamlformat:
+  Solution for .dev-tools.locks/ocamlformat:
   - ocamlformat.0.26.0
 
 Delete ocamlformat's lockfile.
-  $ rm dev-tools.locks/ocamlformat/ocamlformat.pkg
+  $ rm "${dev_tool_lock_dir}"/ocamlformat.pkg
 
 Reinstall ocamlformat.
   $ dune tools install ocamlformat
   Warning: The lock directory for the tool "ocamlformat" exists but does not
   contain a lockfile for the package "ocamlformat". This may indicate that the
   lock directory has been tampered with. Please avoid making manual changes to
   tool lock directories. The tool will now be relocked.
-  Solution for dev-tools.locks/ocamlformat:
+  Solution for .dev-tools.locks/ocamlformat:
   - ocamlformat.0.26.0
diff --git a/test/blackbox-tests/test-cases/pkg/ocamlformat/ocamlformat-solving-fails.t b/test/blackbox-tests/test-cases/pkg/ocamlformat/ocamlformat-solving-fails.t
@@ -15,7 +15,7 @@ Update ".ocamlformat" file with unknown version of OCamlFormat.
 Format, it shows the solving error.
   $ DUNE_CONFIG__LOCK_DEV_TOOL=enabled dune fmt
   Error: Unable to solve dependencies for the following lock directories:
-  Lock directory dev-tools.locks/ocamlformat:
+  Lock directory .dev-tools.locks/ocamlformat:
   Couldn't solve the package dependency formula.
   The following packages couldn't be found: ocamlformat
   [1]
diff --git a/test/blackbox-tests/test-cases/pkg/ocamlformat/ocamlformat-version-change.t b/test/blackbox-tests/test-cases/pkg/ocamlformat/ocamlformat-version-change.t
@@ -22,7 +22,7 @@ Create .ocamlformat file
 
 Install ocamlformat. 0.26.0 should be installed because that's the version in .ocamlformat.
   $ dune tools install ocamlformat
-  Solution for dev-tools.locks/ocamlformat:
+  Solution for .dev-tools.locks/ocamlformat:
   - ocamlformat.0.26.0
 
 Change the version in .ocamlformat.
@@ -35,5 +35,5 @@ Install ocamlformat again. Dune should detect that the version has changed and r
   The lock directory for the tool "ocamlformat" exists but contains a solution
   for 0.26.0 of the tool, whereas version 0.27.0 now needs to be installed. The
   tool will now be re-locked.
-  Solution for dev-tools.locks/ocamlformat:
+  Solution for .dev-tools.locks/ocamlformat:
   - ocamlformat.0.27.0
diff --git a/test/blackbox-tests/test-cases/pkg/ocamlformat/ocamlformat-which.t b/test/blackbox-tests/test-cases/pkg/ocamlformat/ocamlformat-which.t
@@ -21,7 +21,7 @@ The command will fail because the dev tool is not installed:
 
 Install the dev tool:
   $ dune tools exec ocamlformat
-  Solution for dev-tools.locks/ocamlformat:
+  Solution for .dev-tools.locks/ocamlformat:
   - ocamlformat.0.26.2
        Running 'ocamlformat'
   formatted with version 0.26.2
diff --git a/test/blackbox-tests/test-cases/pkg/ocamlformat/ocamlformat-wrapper.t b/test/blackbox-tests/test-cases/pkg/ocamlformat/ocamlformat-wrapper.t
@@ -8,7 +8,7 @@ Exercise running the ocamlformat wrapper command.
   $ make_project_with_dev_tool_lockdir
 
   $ DUNE_CONFIG__LOCK_DEV_TOOL=enabled dune tools exec ocamlformat
-  Solution for dev-tools.locks/ocamlformat:
+  Solution for .dev-tools.locks/ocamlformat:
   - ocamlformat.0.26.2
        Running 'ocamlformat'
   formatted with version 0.26.2
diff --git a/test/blackbox-tests/test-cases/pkg/ocamllsp/dev-tool-ocamllsp-basic.t b/test/blackbox-tests/test-cases/pkg/ocamllsp/dev-tool-ocamllsp-basic.t
@@ -25,7 +25,7 @@ a lockdir containing an "ocaml" lockfile.
   > EOF
 
   $ dune tools exec ocamllsp
-  Solution for dev-tools.locks/ocaml-lsp-server:
+  Solution for .dev-tools.locks/ocaml-lsp-server:
   - ocaml.5.2.0
   - ocaml-lsp-server.0.0.1
        Running 'ocamllsp'
diff --git a/test/blackbox-tests/test-cases/pkg/ocamllsp/dev-tool-ocamllsp-env-path-var.t b/test/blackbox-tests/test-cases/pkg/ocamllsp/dev-tool-ocamllsp-env-path-var.t
@@ -24,7 +24,7 @@ Make a fake ocamllsp package that prints out the PATH variable:
 
 Confirm that each dev tool's bin directory is now in PATH:
   $ dune tools exec ocamllsp | tr : '\n' | grep '_build/_private/default/.dev-tool'
-  Solution for dev-tools.locks/ocaml-lsp-server:
+  Solution for .dev-tools.locks/ocaml-lsp-server:
   - ocaml.5.2.0
   - ocaml-lsp-server.0.0.1
        Running 'ocamllsp'
diff --git a/test/blackbox-tests/test-cases/pkg/ocamllsp/dev-tool-ocamllsp-relock-on-ocaml-version-change.t b/test/blackbox-tests/test-cases/pkg/ocamllsp/dev-tool-ocamllsp-relock-on-ocaml-version-change.t
@@ -29,12 +29,12 @@ same version of the ocaml compiler as the code that it's analyzing.
 
 Initially ocamllsp will be depend on ocaml.5.2.0 to match the project.
   $ dune tools exec ocamllsp
-  Solution for dev-tools.locks/ocaml-lsp-server:
+  Solution for .dev-tools.locks/ocaml-lsp-server:
   - ocaml.5.2.0
   - ocaml-lsp-server.0.0.1
        Running 'ocamllsp'
   hello from fake ocamllsp
-  $ cat dev-tools.locks/ocaml-lsp-server/ocaml.pkg
+  $ cat "${dev_tool_lock_dir}"/ocaml.pkg
   (version 5.2.0)
 
 We can re-run "dune tools exec ocamllsp" without relocking or rebuilding.
@@ -54,10 +54,10 @@ before running. Ocamllsp now depends on ocaml.5.1.0.
   changed to 5.1.0 (formerly the compiler version was 5.2.0). The dev-tool
   "ocaml-lsp-server" will be re-locked and rebuilt with this version of the
   compiler.
-  Solution for dev-tools.locks/ocaml-lsp-server:
+  Solution for .dev-tools.locks/ocaml-lsp-server:
   - ocaml.5.1.0
   - ocaml-lsp-server.0.0.1
        Running 'ocamllsp'
   hello from fake ocamllsp
-  $ cat dev-tools.locks/ocaml-lsp-server/ocaml.pkg
+  $ cat "${dev_tool_lock_dir}"/ocaml.pkg
   (version 5.1.0)
diff --git a/test/blackbox-tests/test-cases/pkg/ocamllsp/helpers.sh b/test/blackbox-tests/test-cases/pkg/ocamllsp/helpers.sh
@@ -1,10 +1,12 @@
+dev_tool_lock_dir=".dev-tools.locks/ocaml-lsp-server"
+
 # Create a dune-workspace file with mock repos set up for the main
 # project and the ocamllsp lockdir.
 setup_ocamllsp_workspace() {
   cat > dune-workspace <<EOF
 (lang dune 3.20)
 (lock_dir
- (path "dev-tools.locks/ocaml-lsp-server")
+ (path "${dev_tool_lock_dir}")
  (repositories mock))
  (lock_dir
   (repositories mock))
diff --git a/test/blackbox-tests/test-cases/pkg/odoc/dev-tool-odoc-basic.t b/test/blackbox-tests/test-cases/pkg/odoc/dev-tool-odoc-basic.t
@@ -25,7 +25,7 @@ a lockdir containing an "ocaml" lockfile.
   > EOF
 
   $ DUNE_CONFIG__LOCK_DEV_TOOL=enabled dune ocaml doc
-  Solution for dev-tools.locks/odoc:
+  Solution for .dev-tools.locks/odoc:
   - ocaml.5.2.0
   - odoc.0.0.1
   hello from fake odoc
diff --git a/test/blackbox-tests/test-cases/pkg/odoc/dev-tool-odoc-relock-on-ocaml-version-change.t b/test/blackbox-tests/test-cases/pkg/odoc/dev-tool-odoc-relock-on-ocaml-version-change.t
@@ -29,7 +29,7 @@ same version of the ocaml compiler as the code that it's analyzing.
 
 Initially odoc will be depend on ocaml.5.2.0 to match the project.
   $ DUNE_CONFIG__LOCK_DEV_TOOL=enabled dune ocaml doc
-  Solution for dev-tools.locks/odoc:
+  Solution for .dev-tools.locks/odoc:
   - ocaml.5.2.0
   - odoc.0.0.1
   hello from fake odoc
@@ -40,7 +40,7 @@ Initially odoc will be depend on ocaml.5.2.0 to match the project.
   Error: Rule failed to generate the following targets:
   - _doc/_odoc/pkg/foo/page-index.odoc
   [1]
-  $ cat dev-tools.locks/odoc/ocaml.pkg
+  $ cat "${dev_tool_lock_dir}"/ocaml.pkg
   (version 5.2.0)
 
 We can re-run "dune ocaml doc" without relocking or rebuilding.
@@ -65,7 +65,7 @@ before running. Odoc now depends on ocaml.5.1.0.
   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
   "odoc" will be re-locked and rebuilt with this version of the compiler.
-  Solution for dev-tools.locks/odoc:
+  Solution for .dev-tools.locks/odoc:
   - ocaml.5.1.0
   - odoc.0.0.1
   hello from fake odoc
diff --git a/test/blackbox-tests/test-cases/pkg/odoc/helpers.sh b/test/blackbox-tests/test-cases/pkg/odoc/helpers.sh
@@ -1,11 +1,13 @@
+dev_tool_lock_dir=".dev-tools.locks/odoc"
+
 # Create a dune-workspace file with mock repos set up for the main
 # project and the odoc lockdir.
 setup_odoc_workspace() {
   cat > dune-workspace <<EOF
 (lang dune 3.20)
 (pkg enabled)
 (lock_dir
- (path "dev-tools.locks/odoc")
+ (path "${dev_tool_lock_dir}")
  (repositories mock))
  (lock_dir
   (repositories mock))
