[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 38/61] tests: build the helper program by default
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PULL 38/61] tests: build the helper program by default |
Date: |
Fri, 11 Oct 2013 17:05:28 +0200 |
From: Wenchao Xia <address@hidden>
Usually we may configure and make, then goto ./tests/qemu-iotest,
check. In this case an error will happen since helper program
was not built. This patch simply build it by default. A better way
may be introducing Makefile in ./tests/qemu-iotest, but it is more
complicate to handle out of tree case, and a bit overkill
for a single file now, we can do that when more files come.
Signed-off-by: Wenchao Xia <address@hidden>
Reviewed-by: Fam Zheng <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
tests/Makefile | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/tests/Makefile b/tests/Makefile
index 915ae5e..6d67fdf 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -252,8 +252,10 @@ check-report.html: check-report.xml
# Other tests
+QEMU_IOTESTS_HELPERS-$(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) tests/qemu-iotests/socket_scm_helper$(EXESUF)
+check-tests/qemu-iotests-quick.sh: tests/qemu-iotests-quick.sh
qemu-img$(EXESUF) qemu-io$(EXESUF) $(QEMU_IOTESTS_HELPERS-y)
$<
.PHONY: check-tests/test-qapi.py
@@ -275,5 +277,9 @@ check-unit: $(patsubst %,check-%, $(check-unit-y))
check-block: $(patsubst %,check-%, $(check-block-y))
check: check-qapi-schema check-unit check-qtest
+# Build the help program automatically
+
+all: $(QEMU_IOTESTS_HELPERS-y)
+
-include $(wildcard tests/*.d)
-include $(wildcard tests/libqos/*.d)
--
1.8.1.4
- [Qemu-devel] [PULL 28/61] qcow2: Add overlap-check options, (continued)
- [Qemu-devel] [PULL 28/61] qcow2: Add overlap-check options, Kevin Wolf, 2013/10/11
- [Qemu-devel] [PULL 29/61] qcow2: Array assigning options to OL check bits, Kevin Wolf, 2013/10/11
- [Qemu-devel] [PULL 31/61] qcow2: Evaluate overlap check options, Kevin Wolf, 2013/10/11
- [Qemu-devel] [PULL 30/61] qcow2: Add more overlap check bitmask macros, Kevin Wolf, 2013/10/11
- [Qemu-devel] [PULL 32/61] block/raw_bsd: Employ error parameter, Kevin Wolf, 2013/10/11
- [Qemu-devel] [PULL 33/61] block/raw-win32: Employ error parameter, Kevin Wolf, 2013/10/11
- [Qemu-devel] [PULL 34/61] blkdebug: Employ error parameter, Kevin Wolf, 2013/10/11
- [Qemu-devel] [PULL 35/61] blkverify: Employ error parameter, Kevin Wolf, 2013/10/11
- [Qemu-devel] [PULL 36/61] qemu-iotests: move blank lines of output in case 059, Kevin Wolf, 2013/10/11
- [Qemu-devel] [PULL 37/61] block/raw-posix: Employ error parameter, Kevin Wolf, 2013/10/11
- [Qemu-devel] [PULL 38/61] tests: build the helper program by default,
Kevin Wolf <=
- [Qemu-devel] [PULL 39/61] build: add command check-clean, Kevin Wolf, 2013/10/11
- [Qemu-devel] [PULL 42/61] qapi-types/visit.py: Pass whole expr dict for structs, Kevin Wolf, 2013/10/11
- [Qemu-devel] [PULL 40/61] vmdk: convert error code to use errp, Kevin Wolf, 2013/10/11
- [Qemu-devel] [PULL 43/61] qapi-types/visit.py: Inheritance for structs, Kevin Wolf, 2013/10/11
- [Qemu-devel] [PULL 41/61] vmdk: refuse enabling zeroed grain with flat images, Kevin Wolf, 2013/10/11
- [Qemu-devel] [PULL 44/61] blockdev: Introduce DriveInfo.enable_auto_del, Kevin Wolf, 2013/10/11
- [Qemu-devel] [PULL 45/61] blockdev: 'blockdev-add' QMP command, Kevin Wolf, 2013/10/11
- [Qemu-devel] [PULL 47/61] blockdev: Pass QDict to blockdev_init(), Kevin Wolf, 2013/10/11
- [Qemu-devel] [PULL 46/61] blockdev: Separate ID generation from DriveInfo creation, Kevin Wolf, 2013/10/11
- [Qemu-devel] [PULL 48/61] blockdev: Move parsing of 'media' option to drive_init, Kevin Wolf, 2013/10/11