Update tests to use dune lock dir variable

Author: Leonidas-from-XIV

test/blackbox-tests/test-cases/pkg/check-dependency-hash.t

@@ -15,7 +15,7 @@ Start with a project with a single package with no dependencies:
   > EOF
   Solution for dune.lock:
   (no dependencies to lock)
-  $ cat dune.lock/lock.dune
+  $ cat ${default_lock_dir}/lock.dune
   (lang package 0.1)
 
   (repositories
@@ -49,7 +49,7 @@ Add a non-local dependency to the package:
   > EOF
   Solution for dune.lock:
   - a.0.0.1
-  $ cat dune.lock/lock.dune
+  $ cat ${default_lock_dir}/lock.dune
   (lang package 0.1)
 
   (dependency_hash 7ba1cacd46bb2609d7b9735909c3b8a5)

test/blackbox-tests/test-cases/pkg/compute-checksums-when-missing.t

@@ -26,7 +26,7 @@ A file that will comprise the package source:
 
 Replace the path in the lockfile as it would otherwise include the sandbox
 path.
-  $ cat dune.lock/foo.pkg
+  $ cat ${default_lock_dir}/foo.pkg
   (version 0.0.1)
 
   (source
@@ -54,7 +54,7 @@ Recreate the foo package with a fake port number to signal that the file will
   Warning: download failed with code 404
   Solution for dune.lock:
   - foo.0.0.1
-  $ cat dune.lock/foo.pkg
+  $ cat ${default_lock_dir}/foo.pkg
   (version 0.0.1)
 
   (source

test/blackbox-tests/test-cases/pkg/constraint-conjunction.t

@@ -17,7 +17,7 @@ constraints.
   - a.0.0.1
   - foo.0.0.1
 
-  $ cat dune.lock/foo.pkg
+  $ cat ${default_lock_dir}/foo.pkg
   (version 0.0.1)
 
   (depends a)

test/blackbox-tests/test-cases/pkg/convert-opam-commands.t

@@ -92,7 +92,7 @@ Package which has boolean where string was expected. This should be caught while
   - with-interpolation.0.0.1
   - with-percent-sign.0.0.1
 
-  $ cat dune.lock/standard-dune.pkg
+  $ cat ${default_lock_dir}/standard-dune.pkg
   (version 0.0.1)
   
   (install
@@ -105,7 +105,7 @@ Package which has boolean where string was expected. This should be caught while
      (run dune subst))
     (run dune build -p %{pkg-self:name} -j %{jobs} @install)))
 
-  $ cat dune.lock/with-interpolation.pkg
+  $ cat ${default_lock_dir}/with-interpolation.pkg
   (version 0.0.1)
   
   (install
@@ -116,13 +116,13 @@ Package which has boolean where string was expected. This should be caught while
     (run ./configure --prefix=%{prefix} --docdir=%{doc}/ocaml)
     (run %{make} -j%{jobs})))
 
-  $ cat dune.lock/with-percent-sign.pkg
+  $ cat ${default_lock_dir}/with-percent-sign.pkg
   (version 0.0.1)
   
   (build
    (run printf %d 42))
 
-  $ cat dune.lock/variable-types.pkg
+  $ cat ${default_lock_dir}/variable-types.pkg
   (version 0.0.1)
   
   (build
@@ -144,7 +144,7 @@ Package which has boolean where string was expected. This should be caught while
   Solution for dune.lock:
   - exercise-filters.0.0.1
 
-  $ cat dune.lock/exercise-filters.pkg
+  $ cat ${default_lock_dir}/exercise-filters.pkg
   (version 0.0.1)
   
   (build
@@ -193,7 +193,7 @@ Test that if opam filter translation is disabled the output doesn't contain any
   $ solve exercise-filters
   Solution for dune.lock:
   - exercise-filters.0.0.1
-  $ cat dune.lock/exercise-filters.pkg
+  $ cat ${default_lock_dir}/exercise-filters.pkg
   (version 0.0.1)
   
   (build
@@ -241,7 +241,7 @@ Test that if opam filter translation is disabled the output doesn't contain any
   $ solve exercise-term-filters
   Solution for dune.lock:
   - exercise-term-filters.0.0.1
-  $ cat dune.lock/exercise-term-filters.pkg
+  $ cat ${default_lock_dir}/exercise-term-filters.pkg
   (version 0.0.1)
   
   (build
@@ -301,7 +301,7 @@ to a dune if-statement that checks the "enable" variable (rather than the
 It's probably an error for opam packages to use the "enable" in ways that opam
 doesn't desugar but these tests are included so we can check that behaviour is
 preserved between opam and dune.
-  $ cat dune.lock/package-conjunction-and-string-selection.pkg
+  $ cat ${default_lock_dir}/package-conjunction-and-string-selection.pkg
   (version 0.0.1)
   
   (build

test/blackbox-tests/test-cases/pkg/depexts/solve.t

@@ -21,7 +21,7 @@ locking would add the opam 'depext' field to foo.pkg
   $ dune pkg lock
   Solution for dune.lock:
   - foo.0.0.1
-  $ cat dune.lock/foo.pkg
+  $ cat ${default_lock_dir}/foo.pkg
   (version 0.0.1)
 
   (depexts unzip gnupg)

test/blackbox-tests/test-cases/pkg/depexts/unknown-variable.t

@@ -21,5 +21,5 @@ Locking should succeed and not include the "unzip" package
   $ dune pkg lock 2>&1 | head -n 1
   Solution for dune.lock:
 
-  $ [ -e dune.lock/foo.pkg ] && cat dune.lock/foo.pkg
+  $ cat ${default_lock_dir}/foo.pkg
   (version 0.0.1)

test/blackbox-tests/test-cases/pkg/depopts/depopts-added-to-deps-when-available.t

@@ -19,7 +19,7 @@ The optional dependency on "b" is not included in foo's dependencies because
   Solution for dune.lock:
   - a.0.0.1
   - foo.0.0.1
-  $ cat dune.lock/foo.pkg
+  $ cat ${default_lock_dir}/foo.pkg
   (version 0.0.1)
 
   (depends a)
@@ -37,7 +37,7 @@ the dependencies of "foo", since "b" is part of the package solution:
   - b.0.0.1
   - bar.0.0.1
   - foo.0.0.1
-  $ cat dune.lock/foo.pkg
+  $ cat ${default_lock_dir}/foo.pkg
   (version 0.0.1)
 
   (depends a b)

test/blackbox-tests/test-cases/pkg/depopts/opam-package-with-depopts.t

@@ -16,7 +16,7 @@ Make a package with a depopts field
 When depopts are supported and selected, the above lock should change and we
 should also be able to see a deps field in the lock file:
 
-  $ cat dune.lock/with-depopts.pkg
+  $ cat ${default_lock_dir}/with-depopts.pkg
   (version 0.0.1)
 
 We should also be able to validate the lock directory:

test/blackbox-tests/test-cases/pkg/hash-algos.t

@@ -60,7 +60,7 @@ first checksum to the lockfile for this package.
   - with-sha256.0.0.1
   - with-sha512.0.0.1
 
-  $ cat dune.lock/*
+  $ cat ${default_lock_dir}/*
   (lang package 0.1)
 
   (dependency_hash 32180cf311133b30d0b5be2a40c89f43)

test/blackbox-tests/test-cases/pkg/helpers.sh

@@ -94,10 +94,10 @@ EOF
 }
 
 make_lockpkg() {
-  local dir="dune.lock"
-  mkdir -p $dir
+  local dir="${default_lock_dir}"
+  mkdir -p "$dir"
   local f="$dir/$1.pkg"
-  cat >$f
+  cat > "$f"
 }
 
 solve_project() {
@@ -107,8 +107,8 @@ solve_project() {
 }
 
 make_lockdir() {
-  mkdir -p dune.lock
-  cat >dune.lock/lock.dune <<EOF
+  mkdir -p "${default_lock_dir}"
+  cat > "${default_lock_dir}"/lock.dune <<EOF
 (lang package 0.1)
 (repositories (complete true))
 EOF
@@ -125,7 +125,7 @@ EOF
 }
 
 print_source() {
-  cat dune.lock/$1.pkg | sed -n "/source/,//p" | sed "s#$PWD#PWD#g" | tr '\n' ' '| tr -s " "
+  cat "${default_lock_dir}"/"$1".pkg | sed -n "/source/,//p" | sed "s#$PWD#PWD#g" | tr '\n' ' '| tr -s " "
 }
 
 solve() {