[dvsim] Prevent command echo suppression
At some point in the past, I had refactored the way SW images were
handled. I had added `.ONESHELL:` to the `sw_build` target, assuming
that the `.ONESHELL` would only affect that target (cause all recipes of
a target to execute in the same shell). Turns out, its more of a global
setting - it affects ALL recipes of all targets.
This had an unintended consequence:
For all targets, the first recipe is an echo command printing the name
of that target, the echoing of which is suppressed with an `@`. Because the
rest of the recipes get invoked in the same shell, their echoing is also
suppressed. This makes issues hard to debug.
In this change, the `.ONESHELL` is removed, and all recipes of
`sw_build` are invoked one the same line with a trailing `\`. The first
command is `set -e` which is the equivalent of all commands chained with
`&&` (which is already what we want).
Signed-off-by: Srikrishna Iyer <sriyer@google.com>
diff --git a/hw/dv/tools/dvsim/sim.mk b/hw/dv/tools/dvsim/sim.mk
index 3db2411..a400075 100644
--- a/hw/dv/tools/dvsim/sim.mk
+++ b/hw/dv/tools/dvsim/sim.mk
@@ -49,16 +49,11 @@
cd ${run_dir} && ${pre_run_cmds}
endif
-.ONESHELL:
sw_build: pre_run
@echo "[make]: sw_build"
ifneq (${sw_images},)
- set -e
- mkdir -p ${sw_build_dir}
# Initialize meson build system.
- ${LOCK_SW_BUILD_DIR} "cd ${proj_root} && \
- env BUILD_ROOT=${sw_build_dir} ${proj_root}/meson_init.sh"
-
+ #
# Loop through the list of sw_images and invoke meson on each item.
# `sw_images` is a space-separated list of tests to be built into an image.
# Optionally, each item in the list can have additional metadata / flags using
@@ -68,7 +63,11 @@
# If no delimiter is detected, then the full string is considered to be the
# <path-to-sw-test>. If 1 delimiter is detected, then it must be <path-to-sw-
# test> followed by <index>. The <flag> is considered optional.
- @for sw_image in ${sw_images}; do \
+ set -e; \
+ mkdir -p ${sw_build_dir}; \
+ ${LOCK_SW_BUILD_DIR} "cd ${proj_root} && \
+ env BUILD_ROOT=${sw_build_dir} ${proj_root}/meson_init.sh"; \
+ for sw_image in ${sw_images}; do \
image=`echo $$sw_image | cut -d: -f 1`; \
index=`echo $$sw_image | cut -d: -f 2`; \
flags=(`echo $$sw_image | cut -d: -f 3- --output-delimiter " "`); \
