Re: [RFC v1 1/4] tests/Makefile.include: unbreak non-tcg builds

[Paolo Bonzini]

On 09/10/20 17:21, Claudio Fontana wrote:
> From: Paolo Bonzini <pbonzini@redhat.com>
> 
> XXX known to be wrong, this breaks other non-native builds
> 
> remove dependency of check-block from non-native archs
> 
> 
> ---
>  tests/Makefile.include | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/tests/Makefile.include b/tests/Makefile.include
> index 5aca98e60c..1ca70d88ce 100644
> --- a/tests/Makefile.include
> +++ b/tests/Makefile.include
> @@ -140,7 +140,7 @@ QEMU_IOTESTS_HELPERS-$(CONFIG_LINUX) = 
> tests/qemu-iotests/socket_scm_helper$(EXE
>  check: check-block
>  check-block: $(SRC_PATH)/tests/check-block.sh qemu-img$(EXESUF) \
>               qemu-io$(EXESUF) qemu-nbd$(EXESUF) $(QEMU_IOTESTS_HELPERS-y) \
> -             $(patsubst %-softmmu,qemu-system-%,$(filter 
> %-softmmu,$(TARGET_DIRS)))
> +             qemu-system-$(patsubst ppc64%,ppc64, $(shell uname -m))
>       @$<
>  endif
>  
> 

This is a better one:

diff --git a/tests/Makefile.include b/tests/Makefile.include
index 5aca98e60c..ceeda65da2 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -140,7 +140,7 @@ QEMU_IOTESTS_HELPERS-$(CONFIG_LINUX) = 
tests/qemu-iotests/socket_scm_helper$(EXE
 check: check-block
 check-block: $(SRC_PATH)/tests/check-block.sh qemu-img$(EXESUF) \
                qemu-io$(EXESUF) qemu-nbd$(EXESUF) $(QEMU_IOTESTS_HELPERS-y) \
-               $(patsubst %-softmmu,qemu-system-%,$(filter 
%-softmmu,$(TARGET_DIRS)))
+               $(filter qemu-system-%, $(ninja-targets-c_LINKER) 
$(ninja-targets-cpp_LINKER))
        @$<
 endif