From patchwork Wed Aug 15 03:12:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fam Zheng X-Patchwork-Id: 144262 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp319236ljj; Tue, 14 Aug 2018 20:16:40 -0700 (PDT) X-Google-Smtp-Source: AA+uWPwol2HV7S1N9LB8S+/0aA/wfI0DR1NKXv0JTSPZw8jMjQEnSjYbaY5a2AfBPPcwFHB1k4d9 X-Received: by 2002:a37:6809:: with SMTP id d9-v6mr21726246qkc.444.1534303000670; Tue, 14 Aug 2018 20:16:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1534303000; cv=none; d=google.com; s=arc-20160816; b=WDCYFB8FDNjWqePy5/adZbWEXWV7B+SLPXDkV5sE74n0w1JGWzEkxeaVOLRopNwTGw xLC0QG19d3u//HOTSTSsHwjUXXpoGmevUfMwIUVxOoPxo0vRJTpfzPkWpKMgGQWiZ8tE XrFoHAOa+f6aFPguoMJR7b22b6Shthjo2jDm+M69hcCyCG9q265g4hVUb3ze7y/H168+ bPlCYIv21NDKPiScOIpKCjSL8M/Ib96huA9DogWMJfR6jDqRUdbgZfKhaAUQnblkhsEX x/BQV02d6Ow3Z8uK2j+maXPKnIZBs/CXpsJqDBeIDXB+8aiqkLmDSrahDSx2+Tboo9PE 4Log== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:to:from:arc-authentication-results; bh=3lDUBMRy96REkIGKzPHJ9YZlIuXMCsUQ6IAPVioFbXg=; b=nSkAR5WbXFnrFJMIiH91WGb8+mXYnEPwyA3xcu70ngYreWDUORHwbuWRzCMHPoB6j4 bQk+vqKV/x0jhyZGF9cwwZCd9GgIi8e7+VwQGRGr3iE/ys8fijFToA11H+ehV7EBSTGb PYIA91USoI6hvlibGFLq52EtZbBUYfbynBCmuxTzrCz3oEZ0n9GbNkIwTASmpAj+v89s D2gXKAXebK3YPHvYsT8DxIdSMNtAA6VsB+OoKssfPR/C06sNfOISnhbPdyn5II1XGnSv GSgvVDYsg52RK658Th8hS2wgsLtWCps/YjofOhVMZul8+Qt5dHN6vj6y7nzmEvEfm6D6 m3og== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id o17-v6si5503771qvm.91.2018.08.14.20.16.40 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 14 Aug 2018 20:16:40 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1]:47082 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fpmIa-0008WO-3E for patch@linaro.org; Tue, 14 Aug 2018 23:16:40 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56972) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fpmFQ-0007AK-Nj for qemu-devel@nongnu.org; Tue, 14 Aug 2018 23:13:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fpmFP-0001Dw-AK for qemu-devel@nongnu.org; Tue, 14 Aug 2018 23:13:24 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:36186 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fpmFO-0001C4-Te for qemu-devel@nongnu.org; Tue, 14 Aug 2018 23:13:23 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 490AA819700A; Wed, 15 Aug 2018 03:13:22 +0000 (UTC) Received: from lemon.usersys.redhat.com (ovpn-12-85.pek2.redhat.com [10.72.12.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id D98BF7C4E; Wed, 15 Aug 2018 03:13:20 +0000 (UTC) From: Fam Zheng To: qemu-devel@nongnu.org Date: Wed, 15 Aug 2018 11:12:43 +0800 Message-Id: <20180815031248.14908-13-famz@redhat.com> In-Reply-To: <20180815031248.14908-1-famz@redhat.com> References: <20180815031248.14908-1-famz@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.8]); Wed, 15 Aug 2018 03:13:22 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.8]); Wed, 15 Aug 2018 03:13:22 +0000 (UTC) for IP:'10.11.54.5' DOMAIN:'int-mx05.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'famz@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PULL 12/17] tests/vm: Pass the jobs parallelism setting to 'make check' 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: Peter Maydell Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Peter Maydell Our test suite works for parallel execution too, and this can noticeably speed up a test run; pass the 'jobs' setting to it as well as to the build proper. Signed-off-by: Peter Maydell Message-Id: <20180803085230.30574-3-peter.maydell@linaro.org> Signed-off-by: Fam Zheng --- tests/vm/freebsd | 2 +- tests/vm/netbsd | 2 +- tests/vm/openbsd | 2 +- tests/vm/ubuntu.i386 | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) -- 2.17.1 diff --git a/tests/vm/freebsd b/tests/vm/freebsd index 039dad8f69..2187a17327 100755 --- a/tests/vm/freebsd +++ b/tests/vm/freebsd @@ -24,7 +24,7 @@ class FreeBSDVM(basevm.BaseVM): tar -xf /dev/vtbd1; ./configure {configure_opts}; gmake -j{jobs}; - gmake check; + gmake -j{jobs} check; """ def build_image(self, img): diff --git a/tests/vm/netbsd b/tests/vm/netbsd index 3972d8b45c..2cc4798f0c 100755 --- a/tests/vm/netbsd +++ b/tests/vm/netbsd @@ -24,7 +24,7 @@ class NetBSDVM(basevm.BaseVM): tar -xf /dev/rld1a; ./configure --python=python2.7 {configure_opts}; gmake -j{jobs}; - gmake check; + gmake -j{jobs} check; """ def build_image(self, img): diff --git a/tests/vm/openbsd b/tests/vm/openbsd index 6ae16d97fd..df6b79fe7d 100755 --- a/tests/vm/openbsd +++ b/tests/vm/openbsd @@ -25,7 +25,7 @@ class OpenBSDVM(basevm.BaseVM): ./configure --cc=x86_64-unknown-openbsd6.1-gcc-4.9.4 --python=python2.7 {configure_opts}; gmake -j{jobs}; # XXX: "gmake check" seems to always hang or fail - #gmake check; + #gmake -j{jobs} check; """ def build_image(self, img): diff --git a/tests/vm/ubuntu.i386 b/tests/vm/ubuntu.i386 index fc27b6935e..2498fc7570 100755 --- a/tests/vm/ubuntu.i386 +++ b/tests/vm/ubuntu.i386 @@ -26,7 +26,7 @@ class UbuntuX86VM(basevm.BaseVM): tar -xf /dev/vdb; ./configure {configure_opts}; make -j{jobs}; - make check; + make -j{jobs} check; """ def _gen_cloud_init_iso(self): From patchwork Wed Aug 15 03:12:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fam Zheng X-Patchwork-Id: 144263 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp322464ljj; Tue, 14 Aug 2018 20:21:35 -0700 (PDT) X-Google-Smtp-Source: AA+uWPzm1Qzl70F3vjiH1qELPOiSgbBaSaJbjaw1fruk20seW8odIMFItkmhFvTDpkAaIBcvv8vS X-Received: by 2002:a37:8c46:: with SMTP id o67-v6mr22583623qkd.162.1534303295359; Tue, 14 Aug 2018 20:21:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1534303295; cv=none; d=google.com; s=arc-20160816; b=aAIwSqgjRcQXkkDk7pqfchiz66iW69kvtl+R/ICnDowjIJOCJhAIup2uq1PJQeBmeO stCaDO8+P+HmjC7sn/T85Fy9oVadO+AL55vcyPVqszTI+XUOsoMERxpyh3w6lnaUY4v0 G2q9LQwKnKiSG+nVUe7vsJa8oWBM2kgLkoCGzSJKfff9HeY3PLm95x0DnxJ1t2I4lNZ2 sMmCkVT+Nn8tWyjwDz/9qk3q1nx1c2/4CwsR0DyfDLrrob/BOlnD1VMi1BEvrmauFT2s arU5tSPCE70gMrm+xeCzkemUokuDmEwJB+hkqyKMNUbc0bQyYPrM0KtkQghdH8EAXfFo TupQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:to:from:arc-authentication-results; bh=47CjcxT7A1Rr/RyN4ltBrL8Afh+u2FIOAvmoN4o+SvU=; b=S0p5eYNN5PswsqLZW6gIPpJb404DNBvKguaffQl/l7ikWWvN3rbU9IcTuihfTx5uFL bS0kR80m94LOCGSJ04vDMgbqFD25wFBdA1G+IBT0uT2ouZ5aBqK3Lf8RMIa8IIflcTs4 wI+wdct3FQ/2H+KI1hIGmd2VBuSKh+zWPr1IvFp9oJ1cY+d+mwYbom+dF0QVZ1d2EI+v 1QcI6cRVVUjG1+WSkECghB70nZW6RTcSFdphNLSJ/hH9/9358dPpn4nnx0mYbdRC9qJS ZFI20sJCqzoCSwPTy8909GDsCf8nxQGfYEF4ZkfOw1eGR+tGkVs7OWtzmYOwNUuihffk owKA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id g62-v6si8042107qkh.110.2018.08.14.20.21.35 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 14 Aug 2018 20:21:35 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1]:47110 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fpmNK-0003yu-PU for patch@linaro.org; Tue, 14 Aug 2018 23:21:34 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56998) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fpmFS-0007CN-Er for qemu-devel@nongnu.org; Tue, 14 Aug 2018 23:13:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fpmFR-0001Iy-CE for qemu-devel@nongnu.org; Tue, 14 Aug 2018 23:13:26 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:35482 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fpmFQ-0001H3-Rg for qemu-devel@nongnu.org; Tue, 14 Aug 2018 23:13:25 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 886E3722D0; Wed, 15 Aug 2018 03:13:24 +0000 (UTC) Received: from lemon.usersys.redhat.com (ovpn-12-85.pek2.redhat.com [10.72.12.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 23C91178BC; Wed, 15 Aug 2018 03:13:22 +0000 (UTC) From: Fam Zheng To: qemu-devel@nongnu.org Date: Wed, 15 Aug 2018 11:12:44 +0800 Message-Id: <20180815031248.14908-14-famz@redhat.com> In-Reply-To: <20180815031248.14908-1-famz@redhat.com> References: <20180815031248.14908-1-famz@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.2]); Wed, 15 Aug 2018 03:13:24 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.2]); Wed, 15 Aug 2018 03:13:24 +0000 (UTC) for IP:'10.11.54.5' DOMAIN:'int-mx05.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'famz@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PULL 13/17] tests/vm: Propagate V=1 down into the make inside the VM 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: Peter Maydell Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Peter Maydell Invoking 'make vm-build-freebsd' and friends with V=1 should propagate that verbosity setting down into the build run inside the VM. Make sure we do that. This brings it into line with how the container tests handle V=1. Signed-off-by: Peter Maydell Message-Id: <20180803085230.30574-4-peter.maydell@linaro.org> Signed-off-by: Fam Zheng --- docs/devel/testing.rst | 1 + tests/vm/Makefile.include | 1 + tests/vm/basevm.py | 5 ++++- tests/vm/freebsd | 4 ++-- tests/vm/netbsd | 4 ++-- tests/vm/openbsd | 4 ++-- tests/vm/ubuntu.i386 | 2 +- 7 files changed, 13 insertions(+), 8 deletions(-) -- 2.17.1 diff --git a/docs/devel/testing.rst b/docs/devel/testing.rst index 8e1fa3a66e..727c4019b5 100644 --- a/docs/devel/testing.rst +++ b/docs/devel/testing.rst @@ -434,6 +434,7 @@ Debugging Add ``DEBUG=1`` and/or ``V=1`` to the make command to allow interactive debugging and verbose output. If this is not enough, see the next section. +``V=1`` will be propagated down into the make jobs in the guest. Manual invocation ----------------- diff --git a/tests/vm/Makefile.include b/tests/vm/Makefile.include index a5abb569c5..76f416286e 100644 --- a/tests/vm/Makefile.include +++ b/tests/vm/Makefile.include @@ -40,6 +40,7 @@ vm-build-%: tests/vm/%.img $(if $(V)$(DEBUG), --debug) \ $(if $(DEBUG), --interactive) \ $(if $(J),--jobs $(J)) \ + $(if $(V),--verbose) \ --image "$<" \ --build-qemu $(SRC_PATH), \ " VM-BUILD $*") diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py index 1f1579dc9a..d73cba9edb 100755 --- a/tests/vm/basevm.py +++ b/tests/vm/basevm.py @@ -211,6 +211,8 @@ def parse_args(vm_name): help="force build image even if image exists") parser.add_option("--jobs", type=int, default=multiprocessing.cpu_count() / 2, help="number of virtual CPUs") + parser.add_option("--verbose", "-V", action="store_true", + help="Pass V=1 to builds within the guest") parser.add_option("--build-image", "-b", action="store_true", help="build image") parser.add_option("--build-qemu", @@ -241,7 +243,8 @@ def main(vmcls): vm.add_source_dir(args.build_qemu) cmd = [vm.BUILD_SCRIPT.format( configure_opts = " ".join(argv), - jobs=args.jobs)] + jobs=args.jobs, + verbose = "V=1" if args.verbose else "")] else: cmd = argv img = args.image diff --git a/tests/vm/freebsd b/tests/vm/freebsd index 2187a17327..795f739c7b 100755 --- a/tests/vm/freebsd +++ b/tests/vm/freebsd @@ -23,8 +23,8 @@ class FreeBSDVM(basevm.BaseVM): cd $(mktemp -d /var/tmp/qemu-test.XXXXXX); tar -xf /dev/vtbd1; ./configure {configure_opts}; - gmake -j{jobs}; - gmake -j{jobs} check; + gmake -j{jobs} {verbose}; + gmake -j{jobs} check {verbose}; """ def build_image(self, img): diff --git a/tests/vm/netbsd b/tests/vm/netbsd index 2cc4798f0c..c211672bcb 100755 --- a/tests/vm/netbsd +++ b/tests/vm/netbsd @@ -23,8 +23,8 @@ class NetBSDVM(basevm.BaseVM): cd $(mktemp -d /var/tmp/qemu-test.XXXXXX); tar -xf /dev/rld1a; ./configure --python=python2.7 {configure_opts}; - gmake -j{jobs}; - gmake -j{jobs} check; + gmake -j{jobs} {verbose}; + gmake -j{jobs} check {verbose}; """ def build_image(self, img): diff --git a/tests/vm/openbsd b/tests/vm/openbsd index df6b79fe7d..1e0c2500ad 100755 --- a/tests/vm/openbsd +++ b/tests/vm/openbsd @@ -23,9 +23,9 @@ class OpenBSDVM(basevm.BaseVM): cd $(mktemp -d /var/tmp/qemu-test.XXXXXX); tar -xf /dev/rsd1c; ./configure --cc=x86_64-unknown-openbsd6.1-gcc-4.9.4 --python=python2.7 {configure_opts}; - gmake -j{jobs}; + gmake -j{jobs} {verbose}; # XXX: "gmake check" seems to always hang or fail - #gmake -j{jobs} check; + #gmake -j{jobs} check {verbose}; """ def build_image(self, img): diff --git a/tests/vm/ubuntu.i386 b/tests/vm/ubuntu.i386 index 2498fc7570..160b9be034 100755 --- a/tests/vm/ubuntu.i386 +++ b/tests/vm/ubuntu.i386 @@ -26,7 +26,7 @@ class UbuntuX86VM(basevm.BaseVM): tar -xf /dev/vdb; ./configure {configure_opts}; make -j{jobs}; - make -j{jobs} check; + make check -j{jobs} {verbose}; """ def _gen_cloud_init_iso(self): From patchwork Wed Aug 15 03:12:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fam Zheng X-Patchwork-Id: 144264 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp324007ljj; Tue, 14 Aug 2018 20:23:55 -0700 (PDT) X-Google-Smtp-Source: AA+uWPxvx4dwAfo0T6pxIZqWbZ0E+edd0hjo5wBMlovzc4z+sL0uJwRZgRzFPEFcS6Et2c4D5Qm1 X-Received: by 2002:ac8:705a:: with SMTP id y26-v6mr24550432qtm.118.1534303435385; Tue, 14 Aug 2018 20:23:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1534303435; cv=none; d=google.com; s=arc-20160816; b=EY+CvASlBsXjlts2b4qQgav9CoWuaxueohe7NR+6XjFLLOSXMivmEdXhCPmr3K+9+t 6qGsSCO3CqxusC60aaY2WJIqwZajqWooqr0zb0F8f+JFF/IFQ6Lu3fZxDjZrnGqwHwEz cq05bb7Wr46fuSnzgjRjOrCm9YEVYUAv4Bj6sQnU4JClNsJldte4N11yMczQXBIIpQ8i 9xYQWTNqjGcchnUicAiVLQnO/Vl5OgaiGB8Mb1iiDO1Ah2r9zmecSSuEdzeo8WTwu0pL 3P+0vFBAyFk45UnThEmYtX0h3Z1bMdmv5Rrt443gc6hqgirD2z2+EcbIiR3Alu4/l5IT 2LDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:to:from:arc-authentication-results; bh=QMeogXILY2ko4Fj1JXiC+W+3RIPv11LEAyzGAdjz1S8=; b=h37fH0d+Tfz8DbgGbp+gr/v+6OiGPFCCem2laWt9GnBvfqqLIrYArAffgrYuU8Twjc 4iULkrIrqe8PiwJDd8gd8HepbxfZBsv9OzVNLAYKm0w5AFJMgGXQZ8rlC0RXCTAHrSla yRm40DR8iJD4R7UHYTzEmnBR0vP08vSX2+kOg/+ciYoKJOBhoShUAsOyQi6eykyBQUK3 5EUpjhlOIvqSAS5VdqxvWjQMI+wFwZPDEirispizGeeMfa5zugZl1OGrg7mw/WNOCHZp VGuXYko4JOjbVGGTdZjW54wC0uX0QULLQXmhc9MzmZ+igIoe5L+uT0ODwiNTK6U0TiZK PwxQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id t13-v6si4449261qto.159.2018.08.14.20.23.55 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 14 Aug 2018 20:23:55 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1]:47123 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fpmPa-0005sg-Qv for patch@linaro.org; Tue, 14 Aug 2018 23:23:54 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57010) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fpmFU-0007Ee-Qc for qemu-devel@nongnu.org; Tue, 14 Aug 2018 23:13:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fpmFT-0001SC-Rx for qemu-devel@nongnu.org; Tue, 14 Aug 2018 23:13:28 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:35728 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fpmFT-0001PH-78 for qemu-devel@nongnu.org; Tue, 14 Aug 2018 23:13:27 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id DD42A4018ECF; Wed, 15 Aug 2018 03:13:26 +0000 (UTC) Received: from lemon.usersys.redhat.com (ovpn-12-85.pek2.redhat.com [10.72.12.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3C4087C5E; Wed, 15 Aug 2018 03:13:24 +0000 (UTC) From: Fam Zheng To: qemu-devel@nongnu.org Date: Wed, 15 Aug 2018 11:12:45 +0800 Message-Id: <20180815031248.14908-15-famz@redhat.com> In-Reply-To: <20180815031248.14908-1-famz@redhat.com> References: <20180815031248.14908-1-famz@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.6]); Wed, 15 Aug 2018 03:13:26 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.6]); Wed, 15 Aug 2018 03:13:26 +0000 (UTC) for IP:'10.11.54.5' DOMAIN:'int-mx05.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'famz@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PULL 14/17] tests/vm: Bump guest RAM up from 2G to 4G 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: Peter Maydell Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Peter Maydell Currently we run the guests in a VM which is given only 2G of RAM. Since the guests are configured without any swap space, builds can fail because the system runs out of memory and kills the compiler, especially if the job count is set for a lot of parallelism. Bump the setting up from 2G to 4G to give us some more headroom. Signed-off-by: Peter Maydell Message-Id: <20180803085230.30574-5-peter.maydell@linaro.org> Signed-off-by: Fam Zheng --- tests/vm/basevm.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.17.1 diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py index d73cba9edb..d7149dea7d 100755 --- a/tests/vm/basevm.py +++ b/tests/vm/basevm.py @@ -64,7 +64,7 @@ class BaseVM(object): else: self._stdout = self._devnull self._args = [ \ - "-nodefaults", "-m", "2G", + "-nodefaults", "-m", "4G", "-netdev", "user,id=vnet,hostfwd=:127.0.0.1:0-:22", "-device", "virtio-net-pci,netdev=vnet", "-vnc", "127.0.0.1:0,to=20", From patchwork Wed Aug 15 03:12:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fam Zheng X-Patchwork-Id: 144265 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp324220ljj; Tue, 14 Aug 2018 20:24:15 -0700 (PDT) X-Google-Smtp-Source: AA+uWPxyZw0mu+KRvLuKCNU5RuaBwANLVuDQg6pB3niGjU3sYc51ikX+lpCehyubbSADHfvc09BL X-Received: by 2002:a0c:86f3:: with SMTP id 48-v6mr21099048qvg.165.1534303455163; Tue, 14 Aug 2018 20:24:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1534303455; cv=none; d=google.com; s=arc-20160816; b=a4+pcY+GWy3ruZIcX/ETVL2ihdCf0Fre58QvF9mFO2fsYzpO4xqzchGrBLFPOikbZI ErETaL5t75XZk1XvepQuAKTOZ2BPyQ1IQziOHvB8BCx3muqWial9gN7l+4MeJUaDfvMn /BVufILb/YG4oYlSl2/lfdga7b9oNQTo+CtfHdyPNwbGMNrnRNHt4ZizBbCnEy8TsqM6 GrKnYtCcQriu/98MYoI+mX8PHu5rPuKTaw7uKhc0woe59AlTCHqZ+jwWovJyTN9JCv2C 6oFgSlLNLej4+do2jEkM1ynnOEDO4o1qdgA8cRu++FoP0STIAk6fwAxk1tb7v73fRFsV 3eUg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:to:from:arc-authentication-results; bh=d8zFyJe0i8mphfPGiMXWXQHS9PcXjwb8comfY6VVF6M=; b=0KgXT/dEbfRYyTakKctbcllV73eKfY3oeVKBdX/15F4uEck/20rqxj3VOz1aFXuMcc tb2hhnkCV33URfJfemmVbCA5Sz/KCzt1RE2MUIhc5XCNOgYhDpzertZdSf82DSLf59CD eFD7VT2onCmVFqcbF0EU8MuXXf37l1lw5gUqT1VjQph76yhR1OJSkN5d/81IuTHMVI7G ZMhfxODscA2iDapVieqFUONm9ign5QIw2DOXIiFG0V8nd4aQLMSNMrVDAJxgSrf1d8Oa AKOFne1d4ahXSNa42v51pUXKtDa6sLjKvtd0SbNI1XzxUgdgBEDxB30bDjPpJGbbkOLK YjQg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id i69-v6si10715146qkh.347.2018.08.14.20.24.14 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 14 Aug 2018 20:24:15 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1]:47135 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fpmPu-0006oS-Lt for patch@linaro.org; Tue, 14 Aug 2018 23:24:14 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57032) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fpmFY-0007Ic-9H for qemu-devel@nongnu.org; Tue, 14 Aug 2018 23:13:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fpmFW-0001dD-Hx for qemu-devel@nongnu.org; Tue, 14 Aug 2018 23:13:32 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:35486 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fpmFW-0001ai-4P for qemu-devel@nongnu.org; Tue, 14 Aug 2018 23:13:30 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C62E2722D0; Wed, 15 Aug 2018 03:13:29 +0000 (UTC) Received: from lemon.usersys.redhat.com (ovpn-12-85.pek2.redhat.com [10.72.12.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8F415178BC; Wed, 15 Aug 2018 03:13:27 +0000 (UTC) From: Fam Zheng To: qemu-devel@nongnu.org Date: Wed, 15 Aug 2018 11:12:46 +0800 Message-Id: <20180815031248.14908-16-famz@redhat.com> In-Reply-To: <20180815031248.14908-1-famz@redhat.com> References: <20180815031248.14908-1-famz@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.2]); Wed, 15 Aug 2018 03:13:29 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.2]); Wed, 15 Aug 2018 03:13:29 +0000 (UTC) for IP:'10.11.54.5' DOMAIN:'int-mx05.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'famz@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PULL 15/17] tests/vm: Use make's --output-sync option 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: Peter Maydell Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Peter Maydell Use make's --output-sync option when running tests inside VMs, so that if we're building with parallelization the output doesn't get scrambled. Signed-off-by: Peter Maydell Message-Id: <20180803085230.30574-6-peter.maydell@linaro.org> Signed-off-by: Fam Zheng --- tests/vm/freebsd | 4 ++-- tests/vm/netbsd | 4 ++-- tests/vm/openbsd | 4 ++-- tests/vm/ubuntu.i386 | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) -- 2.17.1 diff --git a/tests/vm/freebsd b/tests/vm/freebsd index 795f739c7b..0a6ec4614a 100755 --- a/tests/vm/freebsd +++ b/tests/vm/freebsd @@ -23,8 +23,8 @@ class FreeBSDVM(basevm.BaseVM): cd $(mktemp -d /var/tmp/qemu-test.XXXXXX); tar -xf /dev/vtbd1; ./configure {configure_opts}; - gmake -j{jobs} {verbose}; - gmake -j{jobs} check {verbose}; + gmake --output-sync -j{jobs} {verbose}; + gmake --output-sync -j{jobs} check {verbose}; """ def build_image(self, img): diff --git a/tests/vm/netbsd b/tests/vm/netbsd index c211672bcb..45c9260dc0 100755 --- a/tests/vm/netbsd +++ b/tests/vm/netbsd @@ -23,8 +23,8 @@ class NetBSDVM(basevm.BaseVM): cd $(mktemp -d /var/tmp/qemu-test.XXXXXX); tar -xf /dev/rld1a; ./configure --python=python2.7 {configure_opts}; - gmake -j{jobs} {verbose}; - gmake -j{jobs} check {verbose}; + gmake --output-sync -j{jobs} {verbose}; + gmake --output-sync -j{jobs} check {verbose}; """ def build_image(self, img): diff --git a/tests/vm/openbsd b/tests/vm/openbsd index 1e0c2500ad..98edfbca4b 100755 --- a/tests/vm/openbsd +++ b/tests/vm/openbsd @@ -23,9 +23,9 @@ class OpenBSDVM(basevm.BaseVM): cd $(mktemp -d /var/tmp/qemu-test.XXXXXX); tar -xf /dev/rsd1c; ./configure --cc=x86_64-unknown-openbsd6.1-gcc-4.9.4 --python=python2.7 {configure_opts}; - gmake -j{jobs} {verbose}; + gmake --output-sync -j{jobs} {verbose}; # XXX: "gmake check" seems to always hang or fail - #gmake -j{jobs} check {verbose}; + #gmake --output-sync -j{jobs} check {verbose}; """ def build_image(self, img): diff --git a/tests/vm/ubuntu.i386 b/tests/vm/ubuntu.i386 index 160b9be034..3f6ed48b74 100755 --- a/tests/vm/ubuntu.i386 +++ b/tests/vm/ubuntu.i386 @@ -25,8 +25,8 @@ class UbuntuX86VM(basevm.BaseVM): sudo chmod a+r /dev/vdb; tar -xf /dev/vdb; ./configure {configure_opts}; - make -j{jobs}; - make check -j{jobs} {verbose}; + make --output-sync -j{jobs}; + make --output-sync check -j{jobs} {verbose}; """ def _gen_cloud_init_iso(self):