diff mbox series

[PULL,32/33] qemu-iotests: Add dependency to qemu-nbd tool

Message ID	20190308125823.32535-33-kwolf@redhat.com
State	New
Headers	show Return-Path: <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> From: Kevin Wolf <kwolf@redhat.com> To: qemu-block@nongnu.org Date: Fri, 8 Mar 2019 13:58:22 +0100 Message-Id: <20190308125823.32535-33-kwolf@redhat.com> In-Reply-To: <20190308125823.32535-1-kwolf@redhat.com> References: <20190308125823.32535-1-kwolf@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 32/33] qemu-iotests: Add dependency to qemu-nbd tool Precedence: list Cc: kwolf@redhat.com, peter.maydell@linaro.org, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>
Series	[PULL,01/33] iotests: use iotests.VM in 238 \| expand [PULL,01/33] iotests: use iotests.VM in 238 [PULL,02/33] qcow2: Default to 4KB for the qcow2 cache entry size [PULL,03/33] iotests: open notrun files in text mode [PULL,04/33] block: iterate_format with account of whitelisting [PULL,05/33] iotests: ask QEMU for supported formats [PULL,06/33] iotests: check whitelisted formats [PULL,07/33] tests/multiboot: Improve portability by searching bash in the $PATH [PULL,08/33] tests/bios-tables: Improve portability by searching bash in the $PATH [PULL,09/33] qemu-iotests: Improve portability by searching bash in the $PATH [PULL,10/33] qemu-iotests: Ensure GNU sed is used [PULL,11/33] qemu-iotests: Test qcow2 preallocation modes [PULL,12/33] qcow2: Simplify preallocation code [PULL,13/33] qcow2: Extend spec for external data files [PULL,14/33] qcow2: Basic definitions for external data files [PULL,15/33] qcow2: Pass bs to qcow2_get_cluster_type() [PULL,16/33] qcow2: Prepare qcow2_get_cluster_type() for external data file [PULL,17/33] qcow2: Prepare count_contiguous_clusters() for external data file [PULL,18/33] qcow2: Don't assume 0 is an invalid cluster offset [PULL,19/33] qcow2: Return 0/-errno in qcow2_alloc_compressed_cluster_offset() [PULL,20/33] qcow2: Prepare qcow2_co_block_status() for data file [PULL,21/33] qcow2: External file I/O [PULL,22/33] qcow2: Return error for snapshot operation with data file [PULL,23/33] qcow2: Support external data file in qemu-img check [PULL,24/33] qcow2: Add basic data-file infrastructure [PULL,25/33] qcow2: Creating images with external data file [PULL,26/33] qcow2: Store data file name in the image [PULL,27/33] qcow2: Implement data-file-raw create option [PULL,28/33] qemu-iotests: Preallocation with external data file [PULL,29/33] qemu-iotests: General tests for qcow2 with external data file [PULL,30/33] qemu-iotests: amend with external data file [PULL,31/33] ahci-test: Add dependency to qemu-img tool [PULL,32/33] qemu-iotests: Add dependency to qemu-nbd tool [PULL,33/33] qcow2 spec: Describe string header extensions

Commit Message

Kevin Wolf March 8, 2019, 12:58 p.m. UTC

From: Philippe Mathieu-Daudé <philmd@redhat.com>

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>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 tests/Makefile.include | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff mbox series

Patch

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))