Fix dune exec -- ../run.exe

Signed-off-by: François Bobot <[email protected]>

bin/exec.ml

@@ -97,7 +97,7 @@ let term =
                 | Error (_ : Action.Prog.Not_found.t) -> not_found ()
                 | Ok prog -> build_prog prog)
               | Relative_to_current_dir -> (
-                let path = Path.relative (Path.build dir) prog in
+                let path = Path.relative_to_source_in_build ~dir prog in
                 (Build_system.file_exists path >>= function
                  | true -> Memo.return (Some path)
                  | false -> (

otherlibs/stdune/path.ml

@@ -994,6 +994,17 @@ let explode_exn t =
   | Some s -> s
   | None -> Code_error.raise "Path.explode_exn" [ ("path", to_dyn t) ]
 
+let relative_to_source_in_build ?error_loc ~dir s =
+  match Build.extract_build_context dir with
+  | None -> relative ?error_loc (In_build_dir dir) s
+  | Some (bctxt, source) -> (
+    let path = relative ?error_loc (In_source_tree source) s in
+    match path with
+    | In_source_tree s ->
+      In_build_dir
+        (Build.relative (Build.of_string bctxt) (Source0.to_string s))
+    | In_build_dir _ | External _ -> path)
+
 let exists t = try Sys.file_exists (to_string t) with Sys_error _ -> false
 
 let readdir_unsorted t = Dune_filesystem_stubs.read_directory (to_string t)

otherlibs/stdune/path.mli

@@ -229,6 +229,11 @@ val is_managed : t -> bool
 
 val relative : ?error_loc:Loc0.t -> t -> string -> t
 
+(** [relative_to_source_in_build ~dir s] compute the path [s] relative to the
+    source directory corresponding to [dir] *)
+val relative_to_source_in_build :
+  ?error_loc:Loc0.t -> dir:Build.t -> string -> t
+
 (** Create an external path. If the argument is relative, assume it is relative
     to the initial directory dune was launched in. *)
 val of_filename_relative_to_initial_cwd : string -> t

src/dune_util/value.ml

@@ -41,18 +41,7 @@ let to_path ?error_loc t ~dir =
 
 let to_path_in_build ?error_loc t ~dir =
   match t with
-  | String s -> (
-    match Path.Build.extract_build_context dir with
-    | None -> Path.relative ?error_loc (Path.build dir) s
-    | Some (bctxt, source) -> (
-      let path = Path.relative ?error_loc (Path.source source) s in
-      match path with
-      | In_source_tree s ->
-        Path.build
-          (Path.Build.relative
-             (Path.Build.of_string bctxt)
-             (Path.Source.to_string s))
-      | In_build_dir _ | External _ -> path))
+  | String s -> Path.relative_to_source_in_build ?error_loc ~dir s
   | Dir p | Path p -> p
 
 module L = struct

test/blackbox-tests/test-cases/rule/dependency-external.t

@@ -172,3 +172,27 @@ rules with dependencies outside the build dir are allowed
   $ dune build --root=a/b @test
   Entering directory 'a/b'
   txt2
+
+# Test dune exec absolute
+  $ cat >a/script.sh <<EOF
+  > #!/bin/sh
+  >  echo "txt1"
+  > EOF
+
+  $ chmod u+x a/script.sh
+
+  $ dune exec --root=a/b -- $(pwd)/a/script.sh
+  Entering directory 'a/b'
+  txt1
+
+# Test dune exec 1 level below
+  $ dune exec --root=a/b -- ../script.sh
+  Entering directory 'a/b'
+  txt1
+
+# Test dune exec 2 level below
+  $ mv a/script.sh .
+
+  $ dune exec --root=a/b -- ../../script.sh
+  Entering directory 'a/b'
+  txt1