diff options
| author | Laszlo Ersek <lersek@redhat.com> | 2019-03-13 16:35:24 +0100 |
|---|---|---|
| committer | Laszlo Ersek <lersek@redhat.com> | 2019-04-17 15:38:35 +0200 |
| commit | 77d47f1f17e6c918371099fd500c38ca73e7dbff (patch) | |
| tree | 13e13de0e35bf02162950d81e8631d062dea87ff | |
| parent | 13814db0408a87ab198e5c4e742def1c56662df7 (diff) | |
| download | qemu-77d47f1f17e6c918371099fd500c38ca73e7dbff.zip | |
tests: add missing dependency to build QTEST_QEMU_BINARY, round 2
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 <lersek@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
Tested-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
| -rw-r--r-- | tests/Makefile.include | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/Makefile.include b/tests/Makefile.include index 36fc73fef5..e2432d5e77 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)) |