david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tests/vm: Propagate V=1 down into the make inside the VM

Browse Source 
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 <peter.maydell@linaro.org>
Message-Id: <20180803085230.30574-4-peter.maydell@linaro.org>
Signed-off-by: Fam Zheng <famz@redhat.com>
This commit is contained in:
Peter Maydell 2018-08-03 09:52:28 +01:00 committed by Fam Zheng
parent ebb61f804d
commit 41e3340afe
7 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/devel/testing.rst
View File

@ -434,6 +434,7 @@ Debugging
Add ``DEBUG=1`` and/or ``V=1`` to the make command to allow interactive 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. 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 Manual invocation
----------------- -----------------

1
tests/vm/Makefile.include
View File

@ -40,6 +40,7 @@ vm-build-%: tests/vm/%.img
$(if $(V)$(DEBUG), --debug) \ $(if $(V)$(DEBUG), --debug) \
$(if $(DEBUG), --interactive) \ $(if $(DEBUG), --interactive) \
$(if $(J),--jobs $(J)) \ $(if $(J),--jobs $(J)) \
$(if $(V),--verbose) \
--image "$<" \ --image "$<" \
--build-qemu $(SRC_PATH), \ --build-qemu $(SRC_PATH), \
" VM-BUILD $*") " VM-BUILD $*")

5
tests/vm/basevm.py
View File

@ -211,6 +211,8 @@ def parse_args(vm_name):
help="force build image even if image exists") help="force build image even if image exists")
parser.add_option("--jobs", type=int, default=multiprocessing.cpu_count() / 2, parser.add_option("--jobs", type=int, default=multiprocessing.cpu_count() / 2,
help="number of virtual CPUs") 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", parser.add_option("--build-image", "-b", action="store_true",
help="build image") help="build image")
parser.add_option("--build-qemu", parser.add_option("--build-qemu",
@ -241,7 +243,8 @@ def main(vmcls):
vm.add_source_dir(args.build_qemu) vm.add_source_dir(args.build_qemu)
cmd = [vm.BUILD_SCRIPT.format( cmd = [vm.BUILD_SCRIPT.format(
configure_opts = " ".join(argv), configure_opts = " ".join(argv),
jobs=args.jobs)] jobs=args.jobs,
verbose = "V=1" if args.verbose else "")]
else: else:
cmd = argv cmd = argv
img = args.image img = args.image

4
tests/vm/freebsd
View File

@ -23,8 +23,8 @@ class FreeBSDVM(basevm.BaseVM):
cd $(mktemp -d /var/tmp/qemu-test.XXXXXX); cd $(mktemp -d /var/tmp/qemu-test.XXXXXX);
tar -xf /dev/vtbd1; tar -xf /dev/vtbd1;
./configure {configure_opts}; ./configure {configure_opts};
gmake -j{jobs}; gmake -j{jobs} {verbose};
gmake -j{jobs} check; gmake -j{jobs} check {verbose};
""" """
def build_image(self, img): def build_image(self, img):

4
tests/vm/netbsd
View File

@ -23,8 +23,8 @@ class NetBSDVM(basevm.BaseVM):
cd $(mktemp -d /var/tmp/qemu-test.XXXXXX); cd $(mktemp -d /var/tmp/qemu-test.XXXXXX);
tar -xf /dev/rld1a; tar -xf /dev/rld1a;
./configure --python=python2.7 {configure_opts}; ./configure --python=python2.7 {configure_opts};
gmake -j{jobs}; gmake -j{jobs} {verbose};
gmake -j{jobs} check; gmake -j{jobs} check {verbose};
""" """
def build_image(self, img): def build_image(self, img):

4
tests/vm/openbsd
View File

@ -23,9 +23,9 @@ class OpenBSDVM(basevm.BaseVM):
cd $(mktemp -d /var/tmp/qemu-test.XXXXXX); cd $(mktemp -d /var/tmp/qemu-test.XXXXXX);
tar -xf /dev/rsd1c; tar -xf /dev/rsd1c;
./configure --cc=x86_64-unknown-openbsd6.1-gcc-4.9.4 --python=python2.7 {configure_opts}; ./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 # XXX: "gmake check" seems to always hang or fail
#gmake -j{jobs} check; #gmake -j{jobs} check {verbose};
""" """
def build_image(self, img): def build_image(self, img):

2
tests/vm/ubuntu.i386
View File

@ -26,7 +26,7 @@ class UbuntuX86VM(basevm.BaseVM):
tar -xf /dev/vdb; tar -xf /dev/vdb;
./configure {configure_opts}; ./configure {configure_opts};
make -j{jobs}; make -j{jobs};
make -j{jobs} check; make check -j{jobs} {verbose};
""" """
def _gen_cloud_init_iso(self): def _gen_cloud_init_iso(self):