From nobody Mon May 6 15:04:48 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1553911795747403.0770817888989; Fri, 29 Mar 2019 19:09:55 -0700 (PDT) Received: from localhost ([127.0.0.1]:43917 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hA3RG-0000ll-CP for importer@patchew.org; Fri, 29 Mar 2019 22:09:43 -0400 Received: from eggs.gnu.org ([209.51.188.92]:45858) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hA12O-0000f9-6j for qemu-devel@nongnu.org; Fri, 29 Mar 2019 19:35:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h9ykG-0004yl-DC for qemu-devel@nongnu.org; Fri, 29 Mar 2019 17:09:02 -0400 Received: from mx1.redhat.com ([209.132.183.28]:60812) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h9ykF-0004PX-5Q for qemu-devel@nongnu.org; Fri, 29 Mar 2019 17:08:59 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 581786446E; Fri, 29 Mar 2019 21:08:09 +0000 (UTC) Received: from virtlab514.virt.lab.eng.bos.redhat.com (virtlab514.virt.lab.eng.bos.redhat.com [10.19.152.210]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8005A6E3F7; Fri, 29 Mar 2019 21:08:08 +0000 (UTC) From: Wainer dos Santos Moschetta To: qemu-devel@nongnu.org Date: Fri, 29 Mar 2019 17:08:00 -0400 Message-Id: <20190329210804.22121-2-wainersm@redhat.com> In-Reply-To: <20190329210804.22121-1-wainersm@redhat.com> References: <20190329210804.22121-1-wainersm@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Fri, 29 Mar 2019 21:08:09 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 1/5] tests/vm: Use python configured on build X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, peter.maydell@linaro.org, philmd@redhat.com, lersek@redhat.com, pbonzini@redhat.com, alex.bennee@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Changed the vm-test makefile to execute python scripts with the interpreter configured on build. This allows to run vm-test targets properly in Linux distros with Python 3 only support. Signed-off-by: Wainer dos Santos Moschetta --- tests/vm/Makefile.include | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/vm/Makefile.include b/tests/vm/Makefile.include index 992d823f6b..6f82676306 100644 --- a/tests/vm/Makefile.include +++ b/tests/vm/Makefile.include @@ -35,7 +35,7 @@ $(IMAGES_DIR)/%.img: $(SRC_PATH)/tests/vm/% \ $(SRC_PATH)/tests/vm/Makefile.include @mkdir -p $(IMAGES_DIR) $(call quiet-command, \ - $< \ + $(PYTHON) $< \ $(if $(V)$(DEBUG), --debug) \ --image "$@" \ --force \ @@ -46,7 +46,7 @@ $(IMAGES_DIR)/%.img: $(SRC_PATH)/tests/vm/% \ # Build in VM $(IMAGE) vm-build-%: $(IMAGES_DIR)/%.img $(call quiet-command, \ - $(SRC_PATH)/tests/vm/$* \ + $(PYTHON) $(SRC_PATH)/tests/vm/$* \ $(if $(V)$(DEBUG), --debug) \ $(if $(DEBUG), --interactive) \ $(if $(J),--jobs $(J)) \ --=20 2.18.1 From nobody Mon May 6 15:04:48 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1553909649693554.2898686334067; Fri, 29 Mar 2019 18:34:09 -0700 (PDT) Received: from localhost ([127.0.0.1]:42325 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hA2sm-0008QW-Ad for importer@patchew.org; Fri, 29 Mar 2019 21:34:04 -0400 Received: from eggs.gnu.org ([209.51.188.92]:46381) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hA12P-0000o4-3c for qemu-devel@nongnu.org; Fri, 29 Mar 2019 19:35:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h9yjx-0004jz-90 for qemu-devel@nongnu.org; Fri, 29 Mar 2019 17:08:42 -0400 Received: from mx1.redhat.com ([209.132.183.28]:52406) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h9yjx-0004Q4-0G for qemu-devel@nongnu.org; Fri, 29 Mar 2019 17:08:41 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 538C3309179A; Fri, 29 Mar 2019 21:08:10 +0000 (UTC) Received: from virtlab514.virt.lab.eng.bos.redhat.com (virtlab514.virt.lab.eng.bos.redhat.com [10.19.152.210]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7A48018247; Fri, 29 Mar 2019 21:08:09 +0000 (UTC) From: Wainer dos Santos Moschetta To: qemu-devel@nongnu.org Date: Fri, 29 Mar 2019 17:08:01 -0400 Message-Id: <20190329210804.22121-3-wainersm@redhat.com> In-Reply-To: <20190329210804.22121-1-wainersm@redhat.com> References: <20190329210804.22121-1-wainersm@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.41]); Fri, 29 Mar 2019 21:08:10 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 2/5] tests/vm: Port basevm to Python 3 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, peter.maydell@linaro.org, philmd@redhat.com, lersek@redhat.com, pbonzini@redhat.com, alex.bennee@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Fixed tests/vm/basevm.py to run with Python 3: - hashlib.sha1() requires an binary encoded object. - uses floor division ("//") (PEP 238). - decode bytes to unicode when needed. Signed-off-by: Wainer dos Santos Moschetta Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- tests/vm/basevm.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py index 0556bdcf9e..083befce9f 100755 --- a/tests/vm/basevm.py +++ b/tests/vm/basevm.py @@ -85,12 +85,12 @@ class BaseVM(object): if not sha256sum: return True checksum =3D subprocess.check_output(["sha256sum", fname]).spl= it()[0] - return sha256sum =3D=3D checksum + return sha256sum =3D=3D checksum.decode() =20 cache_dir =3D os.path.expanduser("~/.cache/qemu-vm/download") if not os.path.exists(cache_dir): os.makedirs(cache_dir) - fname =3D os.path.join(cache_dir, hashlib.sha1(url).hexdigest()) + fname =3D os.path.join(cache_dir, hashlib.sha1(url.encode()).hexdi= gest()) if os.path.exists(fname) and check_sha256sum(fname): return fname logging.debug("Downloading %s to %s...", url, fname) @@ -134,7 +134,7 @@ class BaseVM(object): raise NotImplementedError =20 def add_source_dir(self, src_dir): - name =3D "data-" + hashlib.sha1(src_dir).hexdigest()[:5] + name =3D "data-" + hashlib.sha1(src_dir.encode()).hexdigest()[:5] tarfile =3D os.path.join(self._tmpdir, name + ".tar") logging.debug("Creating archive %s for src_dir dir: %s", tarfile, = src_dir) subprocess.check_call(["./scripts/archive-source.sh", tarfile], @@ -204,7 +204,7 @@ def parse_args(vmcls): =20 def get_default_jobs(): if kvm_available(vmcls.arch): - return multiprocessing.cpu_count() / 2 + return multiprocessing.cpu_count() // 2 else: return 1 =20 --=20 2.18.1 From nobody Mon May 6 15:04:48 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1553906049552516.9151640311254; Fri, 29 Mar 2019 17:34:09 -0700 (PDT) Received: from localhost ([127.0.0.1]:38416 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hA1wf-000760-Sx for importer@patchew.org; Fri, 29 Mar 2019 20:34:01 -0400 Received: from eggs.gnu.org ([209.51.188.92]:45711) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hA12O-0000Zd-6h for qemu-devel@nongnu.org; Fri, 29 Mar 2019 19:35:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h9ykG-0004yq-DW for qemu-devel@nongnu.org; Fri, 29 Mar 2019 17:09:02 -0400 Received: from mx1.redhat.com ([209.132.183.28]:52410) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h9ykF-0004QP-5E for qemu-devel@nongnu.org; Fri, 29 Mar 2019 17:08:59 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 4C63E31688EB; Fri, 29 Mar 2019 21:08:11 +0000 (UTC) Received: from virtlab514.virt.lab.eng.bos.redhat.com (virtlab514.virt.lab.eng.bos.redhat.com [10.19.152.210]) by smtp.corp.redhat.com (Postfix) with ESMTP id 745F76E3F7; Fri, 29 Mar 2019 21:08:10 +0000 (UTC) From: Wainer dos Santos Moschetta To: qemu-devel@nongnu.org Date: Fri, 29 Mar 2019 17:08:02 -0400 Message-Id: <20190329210804.22121-4-wainersm@redhat.com> In-Reply-To: <20190329210804.22121-1-wainersm@redhat.com> References: <20190329210804.22121-1-wainersm@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.41]); Fri, 29 Mar 2019 21:08:11 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 3/5] tests/vm: Detect the image changed on server X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, peter.maydell@linaro.org, philmd@redhat.com, lersek@redhat.com, pbonzini@redhat.com, alex.bennee@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The current implementation of basevm does not check if the image file to be downloaded has changed on server side before honouring the cache. So any change on server-side file can go unnoticed, keeping the cached image. This change implements a simple mechanism to detect the image file changed by using the sha256sum file stored on server. It compares with the expected checksum and then abort the execution on mismatch. Signed-off-by: Wainer dos Santos Moschetta --- tests/vm/basevm.py | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py index 083befce9f..4dfad2dc9b 100755 --- a/tests/vm/basevm.py +++ b/tests/vm/basevm.py @@ -27,6 +27,7 @@ import tempfile import shutil import multiprocessing import traceback +import urllib.request =20 SSH_KEY =3D open(os.path.join(os.path.dirname(__file__), "..", "keys", "id_rsa")).read() @@ -81,6 +82,18 @@ class BaseVM(object): self._data_args =3D [] =20 def _download_with_cache(self, url, sha256sum=3DNone): + + def fetch_image_hash(url): + fetch_url =3D "%s.sha256sum" % url + try: + with urllib.request.urlopen(fetch_url) as response: + content =3D response.read() + except urllib.error.URLError as error: + logging.error("Failed to fetch image checksum file: %s", + fetch_url) + raise error + return content.decode().strip() + def check_sha256sum(fname): if not sha256sum: return True @@ -91,8 +104,24 @@ class BaseVM(object): if not os.path.exists(cache_dir): os.makedirs(cache_dir) fname =3D os.path.join(cache_dir, hashlib.sha1(url.encode()).hexdi= gest()) - if os.path.exists(fname) and check_sha256sum(fname): + + if os.path.exists(fname) and sha256sum is None: return fname + + if sha256sum: + image_checksum =3D fetch_image_hash(url) + # Check the url points to a known image file. + if image_checksum !=3D sha256sum: + logging.error("Image %s checksum (%s) does not match " + + "expected (%s).", url, image_checksum, sha256sum) + raise Exception("Image checksum failed.") + # Check the cached image is up to date. + if os.path.exists(fname): + if check_sha256sum(fname): + return fname + logging.warning("Invalid cached image. Attempt to download= " + + "the updated one.") + logging.debug("Downloading %s to %s...", url, fname) subprocess.check_call(["wget", "-c", url, "-O", fname + ".download= "], stdout=3Dself._stdout, stderr=3Dself._stderr) --=20 2.18.1 From nobody Mon May 6 15:04:48 2024 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1553912458857954.8654041250875; Fri, 29 Mar 2019 19:20:58 -0700 (PDT) Received: from localhost ([127.0.0.1]:44406 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hA3bo-0003v2-4A for importer@patchew.org; Fri, 29 Mar 2019 22:20:36 -0400 Received: from eggs.gnu.org ([209.51.188.92]:46916) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hA12O-00018c-Nf for qemu-devel@nongnu.org; Fri, 29 Mar 2019 19:35:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h9yjx-0004l7-UR for qemu-devel@nongnu.org; Fri, 29 Mar 2019 17:08:43 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37854) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h9yjx-0004R5-KA for qemu-devel@nongnu.org; Fri, 29 Mar 2019 17:08:41 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 46EA091FC3; Fri, 29 Mar 2019 21:08:12 +0000 (UTC) Received: from virtlab514.virt.lab.eng.bos.redhat.com (virtlab514.virt.lab.eng.bos.redhat.com [10.19.152.210]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6E8A06FDDB; Fri, 29 Mar 2019 21:08:11 +0000 (UTC) From: Wainer dos Santos Moschetta To: qemu-devel@nongnu.org Date: Fri, 29 Mar 2019 17:08:03 -0400 Message-Id: <20190329210804.22121-5-wainersm@redhat.com> In-Reply-To: <20190329210804.22121-1-wainersm@redhat.com> References: <20190329210804.22121-1-wainersm@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Fri, 29 Mar 2019 21:08:12 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 4/5] tests/vm: Fix build-centos docker-based tests run X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, peter.maydell@linaro.org, philmd@redhat.com, lersek@redhat.com, pbonzini@redhat.com, alex.bennee@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" `make vm-build-centos` run docker-based tests on CentOS. The created containers should have network otherwise some tests fail. Also fixed the BUILD_SCRIPT template to correctly evaluate "V=3D1" for verbose output. Signed-off-by: Wainer dos Santos Moschetta --- tests/vm/centos | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/vm/centos b/tests/vm/centos index ba133ea429..7417b50af4 100755 --- a/tests/vm/centos +++ b/tests/vm/centos @@ -26,9 +26,9 @@ class CentosVM(basevm.BaseVM): export SRC_ARCHIVE=3D/dev/vdb; sudo chmod a+r $SRC_ARCHIVE; tar -xf $SRC_ARCHIVE; - make docker-test-block@centos7 V=3D{verbose} J=3D{jobs}; - make docker-test-quick@centos7 V=3D{verbose} J=3D{jobs}; - make docker-test-mingw@fedora V=3D{verbose} J=3D{jobs}; + make docker-test-block@centos7 {verbose} J=3D{jobs} NETWORK=3D1; + make docker-test-quick@centos7 {verbose} J=3D{jobs} NETWORK=3D1; + make docker-test-mingw@fedora {verbose} J=3D{jobs} NETWORK=3D1; """ =20 def _gen_cloud_init_iso(self): --=20 2.18.1 From nobody Mon May 6 15:04:48 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1553907437357598.0184426612489; Fri, 29 Mar 2019 17:57:17 -0700 (PDT) Received: from localhost ([127.0.0.1]:40144 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hA2J4-0005Qq-Mw for importer@patchew.org; Fri, 29 Mar 2019 20:57:10 -0400 Received: from eggs.gnu.org ([209.51.188.92]:46862) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hA12O-00015X-6F for qemu-devel@nongnu.org; Fri, 29 Mar 2019 19:35:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h9ykJ-00050L-RP for qemu-devel@nongnu.org; Fri, 29 Mar 2019 17:09:04 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48360) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h9ykJ-0004RO-I4 for qemu-devel@nongnu.org; Fri, 29 Mar 2019 17:09:03 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 42BF93092655; Fri, 29 Mar 2019 21:08:13 +0000 (UTC) Received: from virtlab514.virt.lab.eng.bos.redhat.com (virtlab514.virt.lab.eng.bos.redhat.com [10.19.152.210]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6998D6E3F7; Fri, 29 Mar 2019 21:08:12 +0000 (UTC) From: Wainer dos Santos Moschetta To: qemu-devel@nongnu.org Date: Fri, 29 Mar 2019 17:08:04 -0400 Message-Id: <20190329210804.22121-6-wainersm@redhat.com> In-Reply-To: <20190329210804.22121-1-wainersm@redhat.com> References: <20190329210804.22121-1-wainersm@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.43]); Fri, 29 Mar 2019 21:08:13 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 5/5] tests/vm: Add missing variables on help X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, peter.maydell@linaro.org, philmd@redhat.com, lersek@redhat.com, pbonzini@redhat.com, alex.bennee@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Added description of variables missing on vm-test help. Signed-off-by: Wainer dos Santos Moschetta --- tests/vm/Makefile.include | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tests/vm/Makefile.include b/tests/vm/Makefile.include index 6f82676306..c59411bee0 100644 --- a/tests/vm/Makefile.include +++ b/tests/vm/Makefile.include @@ -21,9 +21,13 @@ vm-test: @echo " vm-clean-all - Clean up VM images" @echo @echo "Special variables:" - @echo " BUILD_TARGET=3Dfoo - override the build target" - @echo " TARGET_LIST=3Da,b,c - Override target list in builds." + @echo " BUILD_TARGET=3Dfoo - Override the build target" + @echo " TARGET_LIST=3Da,b,c - Override target list in builds" @echo ' EXTRA_CONFIGURE_OPTS=3D"..."' + @echo " J=3D[0..9]* - Override the -jN parameter for make= commands" + @echo " DEBUG=3D1 - Enable verbose output on host and i= nteractive debugging" + @echo " V=3D1 - Enable verbose ouput on host and guest commands" + @echo " QEMU=3D/path/to/qemu - Change path to QEMU binary" =20 vm-build-all: $(addprefix vm-build-, $(IMAGES)) =20 --=20 2.18.1