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

tests/vm: Use make's --output-sync option 



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

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} {verbose};

        gmake -j{jobs} check {verbose};

        gmake --output-sync -j{jobs} {verbose};

        gmake --output-sync -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} {verbose};

        gmake -j{jobs} check {verbose};

        gmake --output-sync -j{jobs} {verbose};

        gmake --output-sync -j{jobs} check {verbose};

    """



    def build_image(self, img):

tests/vm/openbsd

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

tests/vm/ubuntu.i386

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