[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v2 05/18] qemu-iotests: Add dependency to qemu-nbd t
From: |
Philippe Mathieu-Daudé |
Subject: |
[Qemu-block] [PATCH v2 05/18] qemu-iotests: Add dependency to qemu-nbd tool |
Date: |
Tue, 29 Jan 2019 18:53:50 +0100 |
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é <address@hidden>
---
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
- [Qemu-block] [PATCH v2 00/18] OpenBSD: Enable qtesting, Philippe Mathieu-Daudé, 2019/01/29
- [Qemu-block] [PATCH v2 01/18] tests/vm: Be verbose while extracting compressed images, Philippe Mathieu-Daudé, 2019/01/29
- [Qemu-block] [PATCH v2 02/18] configure: Disable W^X on OpenBSD, Philippe Mathieu-Daudé, 2019/01/29
- [Qemu-block] [PATCH v2 03/18] tests/vm/openbsd: Disable the W^X protection on the build partition, Philippe Mathieu-Daudé, 2019/01/29
- [Qemu-block] [PATCH v2 04/18] ahci-test: Add dependency to qemu-img tool, Philippe Mathieu-Daudé, 2019/01/29
- [Qemu-block] [PATCH v2 05/18] qemu-iotests: Add dependency to qemu-nbd tool,
Philippe Mathieu-Daudé <=
- [Qemu-block] [PATCH v2 07/18] tests/multiboot: Improve portability by searching bash in the $PATH, Philippe Mathieu-Daudé, 2019/01/29
- [Qemu-block] [PATCH v2 06/18] qemu-iotests: Improve portability by searching bash in the $PATH, Philippe Mathieu-Daudé, 2019/01/29
- [Qemu-block] [PATCH v2 08/18] tests/bios-tables: Improve portability by searching bash in the $PATH, Philippe Mathieu-Daudé, 2019/01/29