diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-08-03 09:52:30 +0100 |
|---|---|---|
| committer | Fam Zheng <famz@redhat.com> | 2018-08-15 10:12:35 +0800 |
| commit | f2d4becdc765b0f8d3095283644c6b62fa5d525a (patch) | |
| tree | 9e7f2064e0df190541bff0817a9ff24147f1db04 /tests/vm | |
| parent | eb2712f5682c747c64f69e32fdb233839d739db8 (diff) | |
| download | qemu-f2d4becdc765b0f8d3095283644c6b62fa5d525a.zip qemu-f2d4becdc765b0f8d3095283644c6b62fa5d525a.tar.gz qemu-f2d4becdc765b0f8d3095283644c6b62fa5d525a.tar.bz2 | |
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>
Diffstat (limited to 'tests/vm')
| -rwxr-xr-x | tests/vm/freebsd | 4 | ||||
| -rwxr-xr-x | tests/vm/netbsd | 4 | ||||
| -rwxr-xr-x | tests/vm/openbsd | 4 | ||||
| -rwxr-xr-x | tests/vm/ubuntu.i386 | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/tests/vm/freebsd b/tests/vm/freebsd index 795f739..0a6ec46 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} {verbose}; - gmake -j{jobs} check {verbose}; + gmake --output-sync -j{jobs} {verbose}; + gmake --output-sync -j{jobs} check {verbose}; """ def build_image(self, img): diff --git a/tests/vm/netbsd b/tests/vm/netbsd index c211672..45c9260 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} {verbose}; - gmake -j{jobs} check {verbose}; + gmake --output-sync -j{jobs} {verbose}; + gmake --output-sync -j{jobs} check {verbose}; """ def build_image(self, img): diff --git a/tests/vm/openbsd b/tests/vm/openbsd index 1e0c250..98edfbc 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} {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): diff --git a/tests/vm/ubuntu.i386 b/tests/vm/ubuntu.i386 index 160b9be..3f6ed48 100755 --- a/tests/vm/ubuntu.i386 +++ b/tests/vm/ubuntu.i386 @@ -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): |