| Message ID | 20190125140017.6092-12-alex.bennee@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | testing/next (binfmt_misc, vm-build and BSD CI) | expand |
On 1/25/19 3:00 PM, Alex Bennée wrote: > The "make check" target calls check-qtest which has the appropriate > system binaries as dependencies so we shouldn't need to do two steps > of make invocation. Doing it in two steps was a hangover from when our > make check couldn't run tests in parallel. > > Signed-off-by: Alex Bennée <alex.bennee@linaro.org> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > tests/vm/freebsd | 1 - > tests/vm/netbsd | 1 - > tests/vm/ubuntu.i386 | 1 - > 3 files changed, 3 deletions(-) > > diff --git a/tests/vm/freebsd b/tests/vm/freebsd > index 19a3729172..a85c866c30 100755 > --- a/tests/vm/freebsd > +++ b/tests/vm/freebsd > @@ -25,7 +25,6 @@ class FreeBSDVM(basevm.BaseVM): > cd $(mktemp -d /var/tmp/qemu-test.XXXXXX); > tar -xf /dev/vtbd1; > ./configure {configure_opts}; > - gmake --output-sync -j{jobs} {verbose}; > gmake --output-sync -j{jobs} check {verbose}; > """ > > diff --git a/tests/vm/netbsd b/tests/vm/netbsd > index fac6a7ce51..edea113bb5 100755 > --- a/tests/vm/netbsd > +++ b/tests/vm/netbsd > @@ -25,7 +25,6 @@ class NetBSDVM(basevm.BaseVM): > cd $(mktemp -d /var/tmp/qemu-test.XXXXXX); > tar -xf /dev/rld1a; > ./configure --python=python2.7 {configure_opts}; > - gmake --output-sync -j{jobs} {verbose}; > gmake --output-sync -j{jobs} check {verbose}; > """ > > diff --git a/tests/vm/ubuntu.i386 b/tests/vm/ubuntu.i386 > index 1b7e1ab8f0..252e514859 100755 > --- a/tests/vm/ubuntu.i386 > +++ b/tests/vm/ubuntu.i386 > @@ -26,7 +26,6 @@ class UbuntuX86VM(basevm.BaseVM): > sudo chmod a+r /dev/vdb; > tar -xf /dev/vdb; > ./configure {configure_opts}; > - make --output-sync -j{jobs}; > make --output-sync check -j{jobs} {verbose}; > """ > >
diff --git a/tests/vm/freebsd b/tests/vm/freebsd index 19a3729172..a85c866c30 100755 --- a/tests/vm/freebsd +++ b/tests/vm/freebsd @@ -25,7 +25,6 @@ class FreeBSDVM(basevm.BaseVM): cd $(mktemp -d /var/tmp/qemu-test.XXXXXX); tar -xf /dev/vtbd1; ./configure {configure_opts}; - gmake --output-sync -j{jobs} {verbose}; gmake --output-sync -j{jobs} check {verbose}; """ diff --git a/tests/vm/netbsd b/tests/vm/netbsd index fac6a7ce51..edea113bb5 100755 --- a/tests/vm/netbsd +++ b/tests/vm/netbsd @@ -25,7 +25,6 @@ class NetBSDVM(basevm.BaseVM): cd $(mktemp -d /var/tmp/qemu-test.XXXXXX); tar -xf /dev/rld1a; ./configure --python=python2.7 {configure_opts}; - gmake --output-sync -j{jobs} {verbose}; gmake --output-sync -j{jobs} check {verbose}; """ diff --git a/tests/vm/ubuntu.i386 b/tests/vm/ubuntu.i386 index 1b7e1ab8f0..252e514859 100755 --- a/tests/vm/ubuntu.i386 +++ b/tests/vm/ubuntu.i386 @@ -26,7 +26,6 @@ class UbuntuX86VM(basevm.BaseVM): sudo chmod a+r /dev/vdb; tar -xf /dev/vdb; ./configure {configure_opts}; - make --output-sync -j{jobs}; make --output-sync check -j{jobs} {verbose}; """
The "make check" target calls check-qtest which has the appropriate system binaries as dependencies so we shouldn't need to do two steps of make invocation. Doing it in two steps was a hangover from when our make check couldn't run tests in parallel. Signed-off-by: Alex Bennée <alex.bennee@linaro.org> --- tests/vm/freebsd | 1 - tests/vm/netbsd | 1 - tests/vm/ubuntu.i386 | 1 - 3 files changed, 3 deletions(-)