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: Peter Maydell <peter.maydell@linaro.org>
Message-Id: <20180803085230.30574-6-peter.maydell@linaro.org>
Signed-off-by: Fam Zheng <famz@redhat.com>
This commit is contained in:
Peter Maydell 2018-08-03 09:52:30 +01:00 committed by Fam Zheng
parent eb2712f568
commit f2d4becdc7
4 changed files with 8 additions and 8 deletions

View File

@ -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):

View File

@ -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):

View File

@ -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):

View File

@ -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):