[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 10/12] tests: add missing dependency to build QTEST_Q
From: |
Laszlo Ersek |
Subject: |
[Qemu-devel] [PULL 10/12] tests: add missing dependency to build QTEST_QEMU_BINARY, round 2 |
Date: |
Tue, 23 Apr 2019 19:15:18 +0200 |
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>
Reviewed-by: Igor Mammedov <address@hidden>
---
Notes:
pull:
- pick up Phil's R-b / T-b
- pick up Igor's R-b
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))
--
2.19.1.3.g30247aa5d201
- [Qemu-devel] [PULL 02/12] roms/edk2-funcs.sh: require gcc-4.8+ for building i386 and x86_64, (continued)
- [Qemu-devel] [PULL 02/12] roms/edk2-funcs.sh: require gcc-4.8+ for building i386 and x86_64, Laszlo Ersek, 2019/04/23
- [Qemu-devel] [PULL 03/12] tests/uefi-test-tools/build.sh: work around TianoCore#1607, Laszlo Ersek, 2019/04/23
- [Qemu-devel] [PULL 04/12] roms/edk2: advance to tag edk2-stable201903, Laszlo Ersek, 2019/04/23
- [Qemu-devel] [PULL 05/12] roms/edk2-funcs.sh: add the qemu_edk2_get_thread_count() function, Laszlo Ersek, 2019/04/23
- [Qemu-devel] [PULL 06/12] roms/Makefile: replace the $(EDK2_EFIROM) target with "edk2-basetools", Laszlo Ersek, 2019/04/23
- [Qemu-devel] [PULL 07/12] roms: build edk2 firmware binaries and variable store templates, Laszlo Ersek, 2019/04/23
- [Qemu-devel] [PULL 08/12] pc-bios: add edk2 firmware binaries and variable store templates, Laszlo Ersek, 2019/04/23
- [Qemu-devel] [PULL 09/12] pc-bios: document the edk2 firmware images; add firmware descriptors, Laszlo Ersek, 2019/04/23
- [Qemu-devel] [PULL 11/12] Makefile: install the edk2 firmware images and their descriptors, Laszlo Ersek, 2019/04/23
- [Qemu-devel] [PULL 12/12] MAINTAINERS: add the "EDK2 Firmware" subsystem, Laszlo Ersek, 2019/04/23
- [Qemu-devel] [PULL 10/12] tests: add missing dependency to build QTEST_QEMU_BINARY, round 2,
Laszlo Ersek <=
- Re: [Qemu-devel] [PULL 00/12] bundle edk2 platform firmware with QEMU, Peter Maydell, 2019/04/24