summaryrefslogtreecommitdiffstats
path: root/tests/Makefile
diff options
context:
space:
mode:
authorWenchao Xia <xiawenc@linux.vnet.ibm.com>2013-09-26 08:42:55 +0800
committerKevin Wolf <kwolf@redhat.com>2013-10-11 16:50:00 +0200
commit22ee5a557acc820109a9948620a26f66e4fa3a8f (patch)
tree00fddebfba0824033678dd5dab1f54eb2de76dc1 /tests/Makefile
parente428e439df4d92ac42cb913a1dd19b86155eae86 (diff)
downloadhqemu-22ee5a557acc820109a9948620a26f66e4fa3a8f.zip
hqemu-22ee5a557acc820109a9948620a26f66e4fa3a8f.tar.gz
tests: build the helper program by default
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 <xiawenc@linux.vnet.ibm.com> Reviewed-by: Fam Zheng <famz@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'tests/Makefile')
-rw-r--r--tests/Makefile8
1 files changed, 7 insertions, 1 deletions
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)
OpenPOWER on IntegriCloud