OpenBSD: Enable qtesting

[Qemu-devel] [PATCH v2 05/18] qemu-iotests: Add dependency to qemu-nbd tool

Posted by Philippe Mathieu-Daudé 6 years, 9 months ago

Since a9660664fde, some iotests use qemu-nbd.
Add a dependency to build it before using it.
This fixes:

  $ gmake check-block
          CHK version_gen.h
    GEN     qemu-img-cmds.h
    CC      qemu-img.o
    LINK    qemu-img
    CC      qemu-io.o
    LINK    qemu-io
  tests/qemu-iotests-quick.sh
  tests/qemu-iotests-quick.sh[6]: ./check: No such file or directory
  gmake: *** [/tmp/qemu-test.9GLXBk/tests/Makefile.include:1059: check-tests/qemu-iotests-quick.sh] Error 1

Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
On Linux, qemu-iotests-quick.sh is a bit less cryptic:

  $ gmake 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
  /home/phil/source/qemu/tests/qemu-iotests-quick.sh
  check: qemu-nbd not found
  gmake: *** [/home/phil/source/qemu/tests/Makefile.include:1059: check-tests/qemu-iotests-quick.sh] Error 1
---
 tests/Makefile.include | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/Makefile.include b/tests/Makefile.include
index 5e03416c81..3c0850704d 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -1055,7 +1055,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))
-- 
2.20.1

Re: [Qemu-devel] [PATCH v2 05/18] qemu-iotests: Add dependency to qemu-nbd tool

Posted by Eric Blake 6 years, 9 months ago

On 1/29/19 11:53 AM, Philippe Mathieu-Daudé wrote:
> Since a9660664fde, some iotests use qemu-nbd.
> Add a dependency to build it before using it.
> This fixes:
> 
>   $ gmake check-block
>           CHK version_gen.h
>     GEN     qemu-img-cmds.h
>     CC      qemu-img.o
>     LINK    qemu-img
>     CC      qemu-io.o
>     LINK    qemu-io
>   tests/qemu-iotests-quick.sh
>   tests/qemu-iotests-quick.sh[6]: ./check: No such file or directory
>   gmake: *** [/tmp/qemu-test.9GLXBk/tests/Makefile.include:1059: check-tests/qemu-iotests-quick.sh] Error 1
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---

Reviewed-by: Eric Blake <eblake@redhat.com>


> +++ b/tests/Makefile.include
> @@ -1055,7 +1055,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)

Worth using backslash-newline to wrap this into a series of shorter lines?


-- 
Eric Blake, Principal Software Engineer
Red Hat, Inc.           +1-919-301-3226
Virtualization:  qemu.org | libvirt.org