fix(pkg): [Context.which] should look up packages in lock dir (#8744)

Signed-off-by: Rudi Grinberg <[email protected]>

src/dune_rules/context.ml

@@ -91,6 +91,7 @@ and t =
   ; default_ocamlpath : Path.t list
   ; build_context : Build_context.t
   ; builder : builder
+  ; which : Filename.t -> Path.t option Memo.t
   }
 
 module Builder = struct
@@ -181,7 +182,7 @@ let profile t = t.builder.profile
 let equal x y = Context_name.equal x.builder.name y.builder.name
 let hash t = Context_name.hash t.builder.name
 let build_context t = t.build_context
-let which t fname = Which.which ~path:t.builder.path fname
+let which t fname = t.which fname
 let host t = Option.value ~default:t t.builder.for_host
 let name t = t.builder.name
 let path t = t.builder.path
@@ -490,6 +491,7 @@ let create (builder : Builder.t) ~(kind : Kind.t) =
     ; findlib_paths = ocamlpath @ default_ocamlpath
     ; default_ocamlpath
     ; build_context = Build_context.create ~name:builder.name
+    ; which
     }
 ;;
 

src/dune_rules/expander.ml

@@ -289,6 +289,7 @@ let file_of_lib db context ~loc ~lib ~file =
       in
       let pkg_root =
         let package = Lib_name.package_name name in
+        (* Why do we return the install path? *)
         Install.Context.lib_dir ~context:(Context.name context) ~package
       in
       Path.build (Path.Build.append_local pkg_root subdir)

test/blackbox-tests/test-cases/pkg/installed-binary.t

@@ -72,9 +72,4 @@ It should also be visible in the workspace:
   > EOF
 
   $ dune build ./testout && cat _build/default/testout
-  File "dune", line 2, characters 30-40:
-  2 |  (with-stdout-to testout (run %{bin:foo})))
-                                    ^^^^^^^^^^
-  Error: Program foo not found in the tree or in PATH
-   (context: default)
-  [1]
+  from test package

test/blackbox-tests/test-cases/pkg/pkg-deps.t

@@ -11,10 +11,11 @@ We should be able to specify (package ..) deps on locally built packages.
   > (install
   >  (progn
   >   (run mkdir -p %{prefix}/bin)
-  >   (run touch %{prefix}/bin/foo)))
+  >   (run touch %{prefix}/bin/foo)
+  >   (run chmod +x %{prefix}/bin/foo)))
   > EOF
 
-  $ cat >dune <<EOF
+  $ cat >dune <<'EOF'
   > (dirs :standard \ external_sources)
   > (rule
   >  (alias foo)
@@ -26,12 +27,8 @@ We should be able to specify (package ..) deps on locally built packages.
   > EOF
 
   $ dune build @foo
-  File "dune", line 7, characters 9-19:
-  7 |    (echo %{bin:foo})))
-               ^^^^^^^^^^
-  Error: Program foo not found in the tree or in PATH
-   (context: default)
-  [1]
+  $TESTCASE_ROOT/_build/_private/default/.pkg/foo/target/bin/foo
+  ../_private/default/.pkg/foo/target/bin/foo
 
 Now we define the external package using a dune project:
 
@@ -53,9 +50,5 @@ Now we define the external package using a dune project:
   > (build (run dune build @install --promote-install-files))
   > EOF
   $ dune build @foo
-  File "dune", line 7, characters 9-19:
-  7 |    (echo %{bin:foo})))
-               ^^^^^^^^^^
-  Error: Program foo not found in the tree or in PATH
-   (context: default)
-  [1]
+  $TESTCASE_ROOT/_build/_private/default/.pkg/foo/target/bin/foo
+  ../_private/default/.pkg/foo/target/bin/foo