diff options
| author | Paolo Bonzini | 2020-09-21 16:34:47 +0200 |
|---|---|---|
| committer | Paolo Bonzini | 2020-09-30 19:11:36 +0200 |
| commit | 2c243053060f7fd47b71dcb6e3b80346b89c796b (patch) | |
| tree | bf6bc3616d68a05026751c6d237a3458dc9dafdc | |
| parent | oss-fuzz: move linker arg to fix coverage-build (diff) | |
| download | qemu-2c243053060f7fd47b71dcb6e3b80346b89c796b.tar.gz qemu-2c243053060f7fd47b71dcb6e3b80346b89c796b.tar.xz qemu-2c243053060f7fd47b71dcb6e3b80346b89c796b.zip | |
tests/tcg: reinstate or replace desired parts of rules.mak
Commit 660f79309303d696531ffb394719dfab3e0c42c0 was a bit overzealous
with respect to tests/tcg, which needed quiet-command and $(BUILD_DIR).
Reinstate quiet-command, and replace $(BUILD_DIR) with just the
current directory.
Reported-by: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
| -rw-r--r-- | tests/tcg/Makefile.qemu | 13 | ||||
| -rwxr-xr-x | tests/tcg/configure.sh | 4 |
2 files changed, 14 insertions, 3 deletions
diff --git a/tests/tcg/Makefile.qemu b/tests/tcg/Makefile.qemu index 0332bad10f..c096c611a2 100644 --- a/tests/tcg/Makefile.qemu +++ b/tests/tcg/Makefile.qemu @@ -11,9 +11,20 @@ # The configure script fills in extra information about # useful docker images or alternative compiler flags. +# Usage: $(call quiet-command,command and args,"NAME","args to print") +# This will run "command and args", and either: +# if V=1 just print the whole command and args +# otherwise print the 'quiet' output in the format " NAME args to print" +# NAME should be a short name of the command, 7 letters or fewer. +# If called with only a single argument, will print nothing in quiet mode. +quiet-command-run = $(if $(V),,$(if $2,printf " %-7s %s\n" $2 $3 && ))$1 +quiet-@ = $(if $(V),,@) +quiet-command = $(quiet-@)$(call quiet-command-run,$1,$2,$3) + CROSS_CC_GUEST:= DOCKER_IMAGE:= --include $(BUILD_DIR)/tests/tcg/config-$(TARGET).mak + +-include tests/tcg/config-$(TARGET).mak GUEST_BUILD= TCG_MAKE=../Makefile.target diff --git a/tests/tcg/configure.sh b/tests/tcg/configure.sh index 598a50cd4f..be51bdb5a4 100755 --- a/tests/tcg/configure.sh +++ b/tests/tcg/configure.sh @@ -193,11 +193,11 @@ for target in $target_list; do case $target in *-linux-user | *-bsd-user) echo "CONFIG_USER_ONLY=y" >> $config_target_mak - echo "QEMU=\$(BUILD_DIR)/qemu-$arch" >> $config_target_mak + echo "QEMU=$PWD/qemu-$arch" >> $config_target_mak ;; *-softmmu) echo "CONFIG_SOFTMMU=y" >> $config_target_mak - echo "QEMU=\$(BUILD_DIR)/qemu-system-$arch" >> $config_target_mak + echo "QEMU=$PWD/qemu-system-$arch" >> $config_target_mak ;; esac |