Commit 41e3340a authored by Peter Maydell's avatar Peter Maydell Committed by Fam Zheng
Browse files

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



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: default avatarPeter Maydell <peter.maydell@linaro.org>
Message-Id: <20180803085230.30574-4-peter.maydell@linaro.org>
Signed-off-by: default avatarFam Zheng <famz@redhat.com>
parent ebb61f80

docs/devel/testing.rst

+1 −0
Original line number Diff line number Diff line
@@ -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

-----------------

tests/vm/Makefile.include

+1 −0
Original line number Diff line number Diff line
@@ -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 $*")

tests/vm/basevm.py

+4 −1
Original line number Diff line number Diff line
@@ -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

tests/vm/freebsd

+2 −2
Original line number Diff line number Diff line
@@ -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):

tests/vm/netbsd

+2 −2
Original line number Diff line number Diff line
@@ -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):