Message ID | 20190307151046.15086-3-philmd@redhat.com |
---|---|
State | New |
Headers | show |
Series | qemu-iotests: Add dependency to qemu-block tools | expand |
On 3/7/19 9:10 AM, Philippe Mathieu-Daudé wrote: > Since a9660664fde, some iotests use qemu-nbd. > Add a dependency to build it before using it. > This fixes: > > $ make check-block > GEN qemu-img-cmds.h > CC qemu-img.o > LINK qemu-img > CC qemu-io.o > LINK qemu-io > CC tests/qemu-iotests/socket_scm_helper.o > LINK tests/qemu-iotests/socket_scm_helper > tests/qemu-iotests-quick.sh > check: qemu-nbd not found > make: *** [tests/Makefile.include:1059: check-tests/qemu-iotests-quick.sh] Error 1 > > Reviewed-by: Eric Blake <eblake@redhat.com> > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > tests/Makefile.include | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) I still have an NBD pull request coming up before soft freeze. Should I be planning to take this patch (as it is NBD-related) or the whole series (even though the first is more of a stretch), or is there a better tree for this to be staged through?
diff --git a/tests/Makefile.include b/tests/Makefile.include index b6bd0a5ed8..45a4302103 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -1104,7 +1104,7 @@ clean-tcg: $(CLEAN_TCG_TARGET_RULES) QEMU_IOTESTS_HELPERS-$(call land,$(CONFIG_SOFTMMU),$(CONFIG_LINUX)) = tests/qemu-iotests/socket_scm_helper$(EXESUF) .PHONY: check-tests/qemu-iotests-quick.sh -check-tests/qemu-iotests-quick.sh: tests/qemu-iotests-quick.sh qemu-img$(EXESUF) qemu-io$(EXESUF) $(QEMU_IOTESTS_HELPERS-y) +check-tests/qemu-iotests-quick.sh: tests/qemu-iotests-quick.sh qemu-img$(EXESUF) qemu-io$(EXESUF) qemu-nbd$(EXESUF) $(QEMU_IOTESTS_HELPERS-y) $< .PHONY: $(patsubst %, check-%, $(check-qapi-schema-y))