{"id":811454,"url":"http://patchwork.ozlabs.org/api/patches/811454/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170908095506.13594-17-famz@redhat.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170908095506.13594-17-famz@redhat.com>","list_archive_url":null,"date":"2017-09-08T09:54:44","name":"[PULL,16/38] Makefile: Add rules to run vm tests","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"c7ee30a86a40dcfa95bed8c7f79eba13e192f19b","submitter":{"id":24872,"url":"http://patchwork.ozlabs.org/api/people/24872/?format=json","name":"Fam Zheng","email":"famz@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170908095506.13594-17-famz@redhat.com/mbox/","series":[{"id":2164,"url":"http://patchwork.ozlabs.org/api/series/2164/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=2164","date":"2017-09-08T09:54:28","name":"[PULL,01/38] docker: ensure NOUSER for travis images","version":1,"mbox":"http://patchwork.ozlabs.org/series/2164/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/811454/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/811454/checks/","tags":{},"related":[],"headers":{"Return-Path":"<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=<UNKNOWN>)","ext-mx01.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx01.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=famz@redhat.com"],"Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xpXwd2Y5Nz9s7C\n\tfor <incoming@patchwork.ozlabs.org>;\n\tFri,  8 Sep 2017 20:04:17 +1000 (AEST)","from localhost ([::1]:44274 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>)\n\tid 1dqG91-0006l4-DI\n\tfor incoming@patchwork.ozlabs.org; Fri, 08 Sep 2017 06:04:15 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:41737)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from <famz@redhat.com>) id 1dqG0p-0007zm-Gd\n\tfor qemu-devel@nongnu.org; Fri, 08 Sep 2017 05:55:52 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from <famz@redhat.com>) id 1dqG0k-0004iW-Mu\n\tfor qemu-devel@nongnu.org; Fri, 08 Sep 2017 05:55:47 -0400","from mx1.redhat.com ([209.132.183.28]:36092)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from <famz@redhat.com>) id 1dqG0k-0004hQ-DV\n\tfor qemu-devel@nongnu.org; Fri, 08 Sep 2017 05:55:42 -0400","from smtp.corp.redhat.com\n\t(int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id 63CDD81DF1;\n\tFri,  8 Sep 2017 09:55:41 +0000 (UTC)","from lemon.redhat.com (ovpn-12-98.pek2.redhat.com [10.72.12.98])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 2A69360265;\n\tFri,  8 Sep 2017 09:55:39 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 63CDD81DF1","From":"Fam Zheng <famz@redhat.com>","To":"qemu-devel@nongnu.org","Date":"Fri,  8 Sep 2017 17:54:44 +0800","Message-Id":"<20170908095506.13594-17-famz@redhat.com>","In-Reply-To":"<20170908095506.13594-1-famz@redhat.com>","References":"<20170908095506.13594-1-famz@redhat.com>","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.12","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.25]);\n\tFri, 08 Sep 2017 09:55:41 +0000 (UTC)","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]","X-Received-From":"209.132.183.28","Subject":"[Qemu-devel] [PULL 16/38] Makefile: Add rules to run vm tests","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"<qemu-devel.nongnu.org>","List-Unsubscribe":"<https://lists.nongnu.org/mailman/options/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>","List-Archive":"<http://lists.nongnu.org/archive/html/qemu-devel/>","List-Post":"<mailto:qemu-devel@nongnu.org>","List-Help":"<mailto:qemu-devel-request@nongnu.org?subject=help>","List-Subscribe":"<https://lists.nongnu.org/mailman/listinfo/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=subscribe>","Cc":"Peter Maydell <peter.maydell@linaro.org>","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>"},"content":"Signed-off-by: Fam Zheng <famz@redhat.com>\nMessage-Id: <20170905021201.25684-10-famz@redhat.com>\n---\n Makefile                  |  2 ++\n configure                 |  2 +-\n tests/vm/Makefile.include | 42 ++++++++++++++++++++++++++++++++++++++++++\n 3 files changed, 45 insertions(+), 1 deletion(-)\n create mode 100644 tests/vm/Makefile.include","diff":"diff --git a/Makefile b/Makefile\nindex 337a1f6f9b..946eb2ce35 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -822,6 +822,7 @@ endif\n -include $(wildcard *.d tests/*.d)\n \n include $(SRC_PATH)/tests/docker/Makefile.include\n+include $(SRC_PATH)/tests/vm/Makefile.include\n \n .PHONY: help\n help:\n@@ -845,6 +846,7 @@ help:\n \t@echo  'Test targets:'\n \t@echo  '  check           - Run all tests (check-help for details)'\n \t@echo  '  docker          - Help about targets running tests inside Docker containers'\n+\t@echo  '  vm-test         - Help about targets running tests inside VM'\n \t@echo  ''\n \t@echo  'Documentation targets:'\n \t@echo  '  html info pdf txt'\ndiff --git a/configure b/configure\nindex a541aadebc..c755d733a7 100755\n--- a/configure\n+++ b/configure\n@@ -6557,7 +6557,7 @@ if test \"$ccache_cpp2\" = \"yes\"; then\n fi\n \n # build tree in object directory in case the source is not in the current directory\n-DIRS=\"tests tests/tcg tests/tcg/cris tests/tcg/lm32 tests/libqos tests/qapi-schema tests/tcg/xtensa tests/qemu-iotests\"\n+DIRS=\"tests tests/tcg tests/tcg/cris tests/tcg/lm32 tests/libqos tests/qapi-schema tests/tcg/xtensa tests/qemu-iotests tests/vm\"\n DIRS=\"$DIRS docs docs/interop fsdev\"\n DIRS=\"$DIRS pc-bios/optionrom pc-bios/spapr-rtas pc-bios/s390-ccw\"\n DIRS=\"$DIRS roms/seabios roms/vgabios\"\ndiff --git a/tests/vm/Makefile.include b/tests/vm/Makefile.include\nnew file mode 100644\nindex 0000000000..5daa2a3b73\n--- /dev/null\n+++ b/tests/vm/Makefile.include\n@@ -0,0 +1,42 @@\n+# Makefile for VM tests\n+\n+.PHONY: vm-build-all\n+\n+IMAGES := ubuntu.i386 freebsd netbsd openbsd\n+IMAGE_FILES := $(patsubst %, tests/vm/%.img, $(IMAGES))\n+\n+.PRECIOUS: $(IMAGE_FILES)\n+\n+vm-test:\n+\t@echo \"vm-test: Test QEMU in preconfigured virtual machines\"\n+\t@echo\n+\t@echo \"  vm-build-ubuntu.i386            - Build QEMU in ubuntu i386 VM\"\n+\t@echo \"  vm-build-freebsd                - Build QEMU in FreeBSD VM\"\n+\t@echo \"  vm-build-netbsd                 - Build QEMU in NetBSD VM\"\n+\t@echo \"  vm-build-openbsd                - Build QEMU in OpenBSD VM\"\n+\n+vm-build-all: $(addprefix vm-build-, $(IMAGES))\n+\n+tests/vm/%.img: $(SRC_PATH)/tests/vm/% \\\n+\t\t$(SRC_PATH)/tests/vm/basevm.py \\\n+\t\t$(SRC_PATH)/tests/vm/Makefile.include\n+\t$(call quiet-command, \\\n+\t\t$< \\\n+\t\t$(if $(V)$(DEBUG), --debug) \\\n+\t\t--image \"$@\" \\\n+\t\t--force \\\n+\t\t--build-image $@, \\\n+\t\t\"  VM-IMAGE $*\")\n+\n+\n+# Build in VM $(IMAGE)\n+vm-build-%: tests/vm/%.img\n+\t$(call quiet-command, \\\n+\t\t$(SRC_PATH)/tests/vm/$* \\\n+\t\t$(if $(V)$(DEBUG), --debug) \\\n+\t\t$(if $(DEBUG), --interactive) \\\n+\t\t$(if $(J),--jobs $(J)) \\\n+\t\t--image \"$<\" \\\n+\t\t--build-qemu $(SRC_PATH), \\\n+\t\t\"  VM-BUILD $*\")\n+\n","prefixes":["PULL","16/38"]}