| Message ID | 20180711141829.17406-3-famz@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | Add a CentOS test image to run docker tests | expand |
On 07/11/2018 11:18 AM, Fam Zheng wrote: > Our Makefile has: > > vm-build-%: tests/vm/%.img > $(call quiet-command, \ > $(SRC_PATH)/tests/vm/$* \ > $(if $(V)$(DEBUG), --debug) \ > $(if $(DEBUG), --interactive) \ > > the intention of which is to let the make command in VM have V=1 if > V=1 is set. We pass this to the BUILD_SCRIPT format. > > Signed-off-by: Fam Zheng <famz@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- > tests/vm/basevm.py | 3 ++- > tests/vm/freebsd | 4 ++-- > tests/vm/netbsd | 4 ++-- > tests/vm/openbsd | 4 ++-- > tests/vm/ubuntu.i386 | 4 ++-- > 5 files changed, 10 insertions(+), 9 deletions(-) > > diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py > index e5d6a328d5..25361c6b7d 100755 > --- a/tests/vm/basevm.py > +++ b/tests/vm/basevm.py > @@ -240,7 +240,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="1" if args.debug else "")] > else: > cmd = argv > img = args.image > diff --git a/tests/vm/freebsd b/tests/vm/freebsd > index 039dad8f69..b20612a6c9 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}; > - gmake check; > + gmake -j{jobs} V={verbose}; > + gmake check V={verbose}; > """ > > def build_image(self, img): > diff --git a/tests/vm/netbsd b/tests/vm/netbsd > index 3972d8b45c..3f9d34a208 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}; > - gmake check; > + gmake -j{jobs} V={verbose}; > + gmake check V={verbose}; > """ > > def build_image(self, img): > diff --git a/tests/vm/openbsd b/tests/vm/openbsd > index 6ae16d97fd..3285c1abde 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}; > + gmake -j{jobs} V={verbose}; > # XXX: "gmake check" seems to always hang or fail > - #gmake check; > + #gmake check V={verbose}; > """ > > def build_image(self, img): > diff --git a/tests/vm/ubuntu.i386 b/tests/vm/ubuntu.i386 > index fc319e0e6e..b4eaa0dedc 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; > + make -j{jobs} V={verbose}; > + make check V={verbose}; > """ > > def _gen_cloud_init_iso(self): >
diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py index e5d6a328d5..25361c6b7d 100755 --- a/tests/vm/basevm.py +++ b/tests/vm/basevm.py @@ -240,7 +240,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="1" if args.debug else "")] else: cmd = argv img = args.image diff --git a/tests/vm/freebsd b/tests/vm/freebsd index 039dad8f69..b20612a6c9 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}; - gmake check; + gmake -j{jobs} V={verbose}; + gmake check V={verbose}; """ def build_image(self, img): diff --git a/tests/vm/netbsd b/tests/vm/netbsd index 3972d8b45c..3f9d34a208 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}; - gmake check; + gmake -j{jobs} V={verbose}; + gmake check V={verbose}; """ def build_image(self, img): diff --git a/tests/vm/openbsd b/tests/vm/openbsd index 6ae16d97fd..3285c1abde 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}; + gmake -j{jobs} V={verbose}; # XXX: "gmake check" seems to always hang or fail - #gmake check; + #gmake check V={verbose}; """ def build_image(self, img): diff --git a/tests/vm/ubuntu.i386 b/tests/vm/ubuntu.i386 index fc319e0e6e..b4eaa0dedc 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; + make -j{jobs} V={verbose}; + make check V={verbose}; """ def _gen_cloud_init_iso(self):
Our Makefile has: vm-build-%: tests/vm/%.img $(call quiet-command, \ $(SRC_PATH)/tests/vm/$* \ $(if $(V)$(DEBUG), --debug) \ $(if $(DEBUG), --interactive) \ the intention of which is to let the make command in VM have V=1 if V=1 is set. We pass this to the BUILD_SCRIPT format. Signed-off-by: Fam Zheng <famz@redhat.com> --- tests/vm/basevm.py | 3 ++- tests/vm/freebsd | 4 ++-- tests/vm/netbsd | 4 ++-- tests/vm/openbsd | 4 ++-- tests/vm/ubuntu.i386 | 4 ++-- 5 files changed, 10 insertions(+), 9 deletions(-)