aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2020-08-13 09:28:11 -0400
committerPaolo Bonzini <pbonzini@redhat.com>2020-10-17 10:45:51 -0400
commit09e93326e448ab43fa26a9e2d9cc20ecf951f32b (patch)
tree6b923a531aae0b5c4a06879170561adf07948e84 /tests
parent2b8575bd5fbc8a8880e9ecfb1c7e7990feb1fea6 (diff)
downloadqemu-09e93326e448ab43fa26a9e2d9cc20ecf951f32b.zip
qemu-09e93326e448ab43fa26a9e2d9cc20ecf951f32b.tar.gz
qemu-09e93326e448ab43fa26a9e2d9cc20ecf951f32b.tar.bz2
build: replace ninjatool with ninja
Now that the build is done entirely by Meson, there is no need to keep the Makefile conversion. Instead, we can ask Ninja about the targets it exposes and forward them. The main advantages are, from smallest to largest: - reducing the possible namespace pollution within the Makefile - removal of a relatively large Python program - faster build because parsing Makefile.ninja is slower than parsing build.ninja; and faster build after Meson runs because we do not have to generate Makefile.ninja. - tracking of command lines, which provides more accurate rebuilds In addition the change removes the requirement for GNU make 3.82, which was annoying on Mac, and avoids bugs on Windows due to ninjatool not knowing how to convert Windows escapes to POSIX escapes. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/Makefile.include2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/Makefile.include b/tests/Makefile.include
index 4037490..3a0524c 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) \
- $(filter qemu-system-%, $(ninja-targets-c_LINKER) $(ninja-targets-cpp_LINKER))
+ $(filter qemu-system-%, $(ninja-targets))
@$<
endif