Re: [Qemu-devel] [PATCH for-4.1 v4 10/12] tests: add missing dependency to build QTEST_QEMU_BINARY, round 2

[Philippe Mathieu-Daudé]

On 4/10/19 1:00 AM, Laszlo Ersek wrote:
> In commit b94b330e2333 ("tests: add missing dependency to build
> QTEST_QEMU_BINARY", 2017-07-31), Phil fixed the dependency list of make
> target "check-qtest-%". Namely, the recipe would set QTEST_QEMU_BINARY to
> the softmmu emulator for the emulation target, but the prerequisites
> didn't include the emulator.
> 
> The same issue affects the "check-report-qtest-%.tap" make target, which
> is the other make target whose recipe sets QTEST_QEMU_BINARY:
> 
>> $ make -j4 check-report-qtest-aarch64.tap
>>   TAP     check-report-qtest-aarch64.tap
>> sh: /.../aarch64-softmmu/qemu-system-aarch64: No such file or directory
> 
> Apply Phil's fix to this make target too.
> 
> Signed-off-by: Laszlo Ersek <address@hidden>
> Reviewed-by: Michal Privoznik <address@hidden>
> Tested-by: Igor Mammedov <address@hidden>
> Reviewed-by: Michael S. Tsirkin <address@hidden>

Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Tested-by: Philippe Mathieu-Daudé <address@hidden>

> ---
> 
> Notes:
>     v4:
>     
>     - no change
>     
>     v3:
>     
>     - pick up Michal's R-b
>     
>     - pick up Igor's T-b
>     
>     - pick up Michael's R-b
>     
>     v2:
>     
>     - new patch, relied upon by the next patch
> 
>  tests/Makefile.include | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/tests/Makefile.include b/tests/Makefile.include
> index 36fc73fef55a..e2432d5e7712 100644
> --- a/tests/Makefile.include
> +++ b/tests/Makefile.include
> @@ -912,7 +912,7 @@ check-speed: $(check-speed-y)
>  
>  # gtester tests with TAP output
>  
> -$(patsubst %, check-report-qtest-%.tap, $(QTEST_TARGETS)): 
> check-report-qtest-%.tap: $(check-qtest-y)
> +$(patsubst %, check-report-qtest-%.tap, $(QTEST_TARGETS)): 
> check-report-qtest-%.tap: subdir-%-softmmu $(check-qtest-y)
>       $(call do_test_tap, $(check-qtest-$*-y) $(check-qtest-generic-y), \
>         QTEST_QEMU_BINARY=$*-softmmu/qemu-system-$* \
>         QTEST_QEMU_IMG=qemu-img$(EXESUF))
>