Fix locating program in exec watch mode #10386
Open
+24
−19
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
gridbugs
force-pushed
the
exec-watch-relative-path-fix
branch
from
a17d456
to
5038bbc
Compare
emillon
reviewed
Apr 4, 2024
| @@ -0,0 +1,34 @@ | |||
| Test the behaviour of exec watch mode when the current directory is not the | |||
There was a problem hiding this comment.
This is a repro for this issue, right? can you land it first in its own PR?
There was a problem hiding this comment.
Made a new pr here: #10391
anmonteiro
reviewed
Apr 4, 2024
anmonteiro
reviewed
Apr 4, 2024
|
gridbugs
force-pushed
the
exec-watch-relative-path-fix
branch
2 times, most recently
from
2774e94
to
27a4ed5
Compare
This fixes a bug where running an executable from the current project with `dune exec --watch` would be unable to find the executable unless the command was run from the project's root directory. The problem was introduced when we started setting the cwd of processes spawned by exec in watch mode to the user's current directory (ocaml#10262). If the program argument to exec refers to a file to be built in the current project (such as an executable implemented in the current project) then the path to the executable to spawn will be a path inside the _build directory relative to the project root. Since the cwd of the new process was set to the user's current directory, this relative path was being resolved within the current directory, whereas it should have been resolved relative to the project root. The fix was to convert relative paths into absolute paths relative to the project root (this was already being done for exec when not in watch mode). Signed-off-by: Stephen Sherratt <stephen@sherra.tt>
gridbugs
force-pushed
the
exec-watch-relative-path-fix
branch
from
27a4ed5
to
627cd51
Compare
|
Just making sure that we don't forget to merge this. Are any other changes necessary? |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This fixes a bug where running an executable from the current project
with
dune exec --watchwould be unable to find the executable unlessthe command was run from the project's root directory.
The problem was introduced when we started setting the cwd of processes
spawned by exec in watch mode to the user's current directory
(#10262). If the program argument to
exec refers to a file to be built in the current project (such as an
executable implemented in the current project) then the path to the
executable to spawn will be a path inside the _build directory relative
to the project root. Since the cwd of the new process was set to the
user's current directory, this relative path was being resolved within
the current directory, whereas it should have been resolved relative to
the project root.
The fix was to convert relative paths into absolute paths relative to
the project root (this was already being done for exec when not in watch
mode).