Stop setting feature flag in portable lockdir tests

Signed-off-by: Stephen Sherratt <[email protected]>

Author: gridbugs

test/blackbox-tests/test-cases/pkg/portable-lockdirs/portable-lockdirs-basic.t

@@ -33,7 +33,7 @@ Create a package that writes a different value to some files depending on the os
   >  (libraries foo))
   > EOF
 
-  $ DUNE_CONFIG__PORTABLE_LOCK_DIR=enabled dune pkg lock
+  $ dune pkg lock
   Solution for dune.lock
 
   Dependencies common to all supported platforms:

test/blackbox-tests/test-cases/pkg/portable-lockdirs/portable-lockdirs-custom-platforms.t

@@ -45,7 +45,7 @@ Create a custom dune-workspace to solve for openbsd.
   >  (libraries foo))
   > EOF
 
-  $ DUNE_CONFIG__PORTABLE_LOCK_DIR=enabled dune pkg lock
+  $ dune pkg lock
   Solution for dune.lock
 
   Dependencies common to all supported platforms:
@@ -102,7 +102,7 @@ error case.
   >  (solve_for_platforms))
   > EOF
 
-  $ DUNE_CONFIG__PORTABLE_LOCK_DIR=enabled dune pkg lock
+  $ dune pkg lock
   File "dune-workspace", line 7, characters 1-22:
   7 |  (solve_for_platforms))
        ^^^^^^^^^^^^^^^^^^^^^

test/blackbox-tests/test-cases/pkg/portable-lockdirs/portable-lockdirs-custom-solver-env.t

@@ -48,7 +48,7 @@ Set up a project that depends on the package:
   > EOF
 
 Solve the project:
-  $ DUNE_CONFIG__PORTABLE_LOCK_DIR=enabled dune pkg lock
+  $ dune pkg lock
   Solution for dune.lock
 
   Dependencies common to all supported platforms:

test/blackbox-tests/test-cases/pkg/portable-lockdirs/portable-lockdirs-dedup-manifest-errors.t

@@ -24,7 +24,7 @@ Create the package "foo" with an invalid opam file:
   > invalid opam file
   > EOF
 
-  $ DUNE_CONFIG__PORTABLE_LOCK_DIR=enabled dune pkg lock
+  $ dune pkg lock
   File "$TESTCASE_ROOT/mock-opam-repository/packages/foo/foo.0.0.1/opam", line 2, characters 8-12:
   2 | invalid opam file
               ^^^^
@@ -37,7 +37,7 @@ Create the package "foo" with an opam file that creates a circular dep with the
   > depends: [ "x" ]
   > EOF
 
-  $ DUNE_CONFIG__PORTABLE_LOCK_DIR=enabled dune pkg lock
+  $ dune pkg lock
   Error: Dune does not support packages outside the workspace depending on
   packages in the workspace. The package "foo" is not in the workspace but it
   depends on the package "x" which is in the workspace.
@@ -48,7 +48,7 @@ Create the package "foo" with an invalid variable interpolation:
   > build: [ "./configure" "--prefix=%{prefix" ]
   > EOF
 
-  $ DUNE_CONFIG__PORTABLE_LOCK_DIR=enabled dune pkg lock
+  $ dune pkg lock
   File "$TESTCASE_ROOT/mock-opam-repository/packages/foo/foo.0.0.1/opam", line 1, characters 0-0:
   Error: Encountered malformed variable interpolation while processing commands
   for package foo.0.0.1.
@@ -97,7 +97,7 @@ Add a file to the package but change its permission to not be readable:
 Make sure to undo the permission change on exit.
   $ trap "chmod +r $pkg_dir/files" EXIT
   $ chmod -r $pkg_dir/files
-  $ DUNE_CONFIG__PORTABLE_LOCK_DIR=enabled dune pkg lock
+  $ dune pkg lock
   Warning: Unable to read directory
   mock-opam-repository/packages/foo/foo.0.0.1/files. Ignoring.
   Remove this message by ignoring by adding:

test/blackbox-tests/test-cases/pkg/portable-lockdirs/portable-lockdirs-depexts-basic.t

@@ -21,7 +21,7 @@ Demonstrate various cases representing depexts in lockfiles.
   >  (depends foo))
   > EOF
 
-  $ DUNE_CONFIG__PORTABLE_LOCK_DIR=enabled dune pkg lock
+  $ dune pkg lock
   Solution for dune.lock
 
   Dependencies common to all supported platforms:

test/blackbox-tests/test-cases/pkg/portable-lockdirs/portable-lockdirs-depexts-pkg-config.t

@@ -51,7 +51,7 @@ correct depext names can be chosen for the current distro at build time.
   >  (depends conf-pkg-config))
   > EOF
 
-  $ DUNE_CONFIG__PORTABLE_LOCK_DIR=enabled dune pkg lock
+  $ dune pkg lock
   Solution for dune.lock
 
   Dependencies common to all supported platforms:

test/blackbox-tests/test-cases/pkg/portable-lockdirs/portable-lockdirs-no-solution.t

@@ -28,7 +28,7 @@ Depend on a pair of packages which can't be coinstalled:
   > EOF
 
 Solver error when solving fails with the same error on all platforms:
-  $ DUNE_CONFIG__PORTABLE_LOCK_DIR=enabled dune pkg lock
+  $ dune pkg lock
   Error:
   Unable to solve dependencies while generating lock directory: dune.lock
 
@@ -56,7 +56,7 @@ Modify the "a" package so the solver error is different on different platforms:
 
 This time there will be two different solver errors. Both will be printed along
 with the platforms where they are relevant:
-  $ DUNE_CONFIG__PORTABLE_LOCK_DIR=enabled dune pkg lock
+  $ dune pkg lock
   Error:
   Unable to solve dependencies while generating lock directory: dune.lock
 

test/blackbox-tests/test-cases/pkg/portable-lockdirs/portable-lockdirs-package-variable-typo-detection.t

@@ -27,7 +27,7 @@ Create a workspace with some typos in package variable names
   >  (allow_empty))
   > EOF
 
-  $ DUNE_CONFIG__PORTABLE_LOCK_DIR=enabled dune pkg lock
+  $ dune pkg lock
   File "dune-workspace", line 10, characters 4-19:
   10 |    (os_distribution debian)
            ^^^^^^^^^^^^^^^

test/blackbox-tests/test-cases/pkg/portable-lockdirs/portable-lockdirs-partial-solve.t

@@ -32,7 +32,7 @@ Make a package that is only available on macos.
 
 Solving will still succeed, but there'll be a warning because dune will attempt
 to solve for macos, linux, and windows by default.
-  $ DUNE_CONFIG__PORTABLE_LOCK_DIR=enabled dune pkg lock
+  $ dune pkg lock
   Solution for dune.lock
 
   Dependencies common to all supported platforms:

test/blackbox-tests/test-cases/pkg/portable-lockdirs/portable-lockdirs-platform-dependant-dependencies.t

@@ -51,7 +51,7 @@ A package that conditionally depends on packages depending on the OS:
   >  (libraries foo))
   > EOF
 
-  $ DUNE_CONFIG__PORTABLE_LOCK_DIR=enabled dune pkg lock
+  $ dune pkg lock
   Solution for dune.lock
 
   Dependencies common to all supported platforms: