Skip to content

Commit 7f3715f

Browse files
roypatbchalios
authored andcommitted
devtool: do not call ensure_ci_artifacts in cmd_sh
This already caused a recursive call between ensure_ci_artifacts and cmd_sh (since the former calls the later), which was only benign because ensure_ci_artifacts exits early if the directory exists. With the next patch, it will use cmd_sh before creating the directory, so break this recursion once and for all by instead making the call-sites of cmd_sh that require artifacts to just ensure them themselves. Signed-off-by: Patrick Roy <[email protected]>
1 parent 1e3d4e9 commit 7f3715f

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

tools/devtool

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -878,7 +878,6 @@ cmd_shell() {
878878

879879
cmd_sh() {
880880
ensure_build_dir
881-
ensure_ci_artifacts
882881
run_devctr \
883882
--privileged \
884883
--ulimit nofile=4096:4096 \
@@ -916,6 +915,7 @@ cmd_sandbox_native() {
916915
}
917916

918917
cmd_test_debug() {
918+
ensure_ci_artifacts
919919
cmd_sh "tmux new ./tools/test.sh --pdb $@"
920920
}
921921

0 commit comments

Comments
 (0)