summaryrefslogtreecommitdiff
path: root/src/buildtool/execution_engine/executor/executor.hpp
diff options
context:
space:
mode:
authorKlaus Aehlig <klaus.aehlig@huawei.com>2025-04-17 13:18:37 +0200
committerKlaus Aehlig <klaus.aehlig@huawei.com>2025-04-17 13:45:30 +0200
commitd65d711f844224dcf9215c52be8f69fd2885adfc (patch)
treec366659430d12c15ef8dd114b8893bde34b034e4 /src/buildtool/execution_engine/executor/executor.hpp
parent1af9c8c55f1543ffe2622e1057bdbf50d0983535 (diff)
downloadjustbuild-d65d711f844224dcf9215c52be8f69fd2885adfc.tar.gz
profile: also honor action cwd
In all presentations of actions to the user, we use output paths relative to the root of the action directory. Therefore, we should do the same in the profile. However, when noting the completion of an action, we get paths as in the wire protocol, i.e., relative to the working directory of the action. Therefore, rebase appropriately.
Diffstat (limited to 'src/buildtool/execution_engine/executor/executor.hpp')
-rw-r--r--src/buildtool/execution_engine/executor/executor.hpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/buildtool/execution_engine/executor/executor.hpp b/src/buildtool/execution_engine/executor/executor.hpp
index 7015f559..d47397f0 100644
--- a/src/buildtool/execution_engine/executor/executor.hpp
+++ b/src/buildtool/execution_engine/executor/executor.hpp
@@ -928,7 +928,9 @@ class Executor {
context_.progress);
if (context_.profile) {
(*context_.profile)
- ->NoteActionCompleted(action->Content().Id(), *response);
+ ->NoteActionCompleted(action->Content().Id(),
+ *response,
+ action->Content().Cwd());
}
return result;
}
@@ -956,7 +958,8 @@ class Executor {
logger, *response, action, context_.statistics, context_.progress);
if (context_.profile) {
(*context_.profile)
- ->NoteActionCompleted(action->Content().Id(), *response);
+ ->NoteActionCompleted(
+ action->Content().Id(), *response, action->Content().Cwd());
}
return result;
}