From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43385) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VUeJ9-0008To-AM for qemu-devel@nongnu.org; Fri, 11 Oct 2013 11:07:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VUeJ3-0005qD-SE for qemu-devel@nongnu.org; Fri, 11 Oct 2013 11:07:15 -0400 Received: from mx1.redhat.com ([209.132.183.28]:18726) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VUeJ3-0005px-KV for qemu-devel@nongnu.org; Fri, 11 Oct 2013 11:07:09 -0400 From: Kevin Wolf Date: Fri, 11 Oct 2013 17:05:28 +0200 Message-Id: <1381503951-27985-39-git-send-email-kwolf@redhat.com> In-Reply-To: <1381503951-27985-1-git-send-email-kwolf@redhat.com> References: <1381503951-27985-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PULL 38/61] tests: build the helper program by default List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org From: Wenchao Xia 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 Reviewed-by: Fam Zheng Signed-off-by: Kevin Wolf --- 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