[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 13/17] tests/vm: Propagate V=1 down into the make ins
From: |
Fam Zheng |
Subject: |
[Qemu-devel] [PULL 13/17] tests/vm: Propagate V=1 down into the make inside the VM |
Date: |
Wed, 15 Aug 2018 11:12:44 +0800 |
From: Peter Maydell <address@hidden>
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 <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Fam Zheng <address@hidden>
---
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(-)
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):
--
2.17.1
- [Qemu-devel] [PULL 00/17] Block and testing patches, Fam Zheng, 2018/08/14
- [Qemu-devel] [PULL 01/17] tests/vm: Only use -cpu 'host' if KVM is available, Fam Zheng, 2018/08/14
- [Qemu-devel] [PULL 02/17] tests/vm: Add flex and bison to the vm image, Fam Zheng, 2018/08/14
- [Qemu-devel] [PULL 05/17] aio-posix: Don't count ctx->notifier as progress when polling, Fam Zheng, 2018/08/14
- [Qemu-devel] [PULL 04/17] nvme: simplify plug/unplug, Fam Zheng, 2018/08/14
- [Qemu-devel] [PULL 03/17] nvme: Fix nvme_init error handling, Fam Zheng, 2018/08/14
- [Qemu-devel] [PULL 06/17] aio: Do aio_notify_accept only during blocking aio_poll, Fam Zheng, 2018/08/14
- [Qemu-devel] [PULL 09/17] tests: Allow overriding archive path with SRC_ARCHIVE, Fam Zheng, 2018/08/14
- [Qemu-devel] [PULL 10/17] tests: Add centos VM testing, Fam Zheng, 2018/08/14
- [Qemu-devel] [PULL 08/17] tests: Add an option for snapshot (default: off), Fam Zheng, 2018/08/14
- [Qemu-devel] [PULL 13/17] tests/vm: Propagate V=1 down into the make inside the VM,
Fam Zheng <=
- [Qemu-devel] [PULL 11/17] tests: vm: Add vm-clean-all, Fam Zheng, 2018/08/14
- [Qemu-devel] [PULL 12/17] tests/vm: Pass the jobs parallelism setting to 'make check', Fam Zheng, 2018/08/14
- [Qemu-devel] [PULL 07/17] docker: Install more packages in centos7, Fam Zheng, 2018/08/14
- [Qemu-devel] [PULL 14/17] tests/vm: Bump guest RAM up from 2G to 4G, Fam Zheng, 2018/08/14
- [Qemu-devel] [PULL 15/17] tests/vm: Use make's --output-sync option, Fam Zheng, 2018/08/14
- [Qemu-devel] [PULL 17/17] aio-posix: Improve comment around marking node deleted, Fam Zheng, 2018/08/14
- [Qemu-devel] [PULL 16/17] tests/vm: Add vm-build-all/vm-clean-all in help text, Fam Zheng, 2018/08/14
- Re: [Qemu-devel] [PULL 00/17] Block and testing patches, Peter Maydell, 2018/08/15
- Re: [Qemu-devel] [PULL 00/17] Block and testing patches, Peter Maydell, 2018/08/15