Pino Toscano
2018-Nov-19 18:35 UTC
[Libguestfs] [PATCH] v2v: create an empty windows.vmdk in case of disabled appliance
In case the appliance is disabled at configure, then all the phony guests will not be built during the 'make check' time. Since the tests already handle an empty windows.vmdk fine (in case ntfs-3g is not available), then just create it empty in this case. Reported by: Martin Kletzander. --- v2v/Makefile.am | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/v2v/Makefile.am b/v2v/Makefile.am index a96166e49..d8a7487f3 100644 --- a/v2v/Makefile.am +++ b/v2v/Makefile.am @@ -479,6 +479,7 @@ endif ENABLE_APPLIANCE # The VMDK file is used for some -i ova tests. check_DATA = windows.vmdk +if ENABLE_APPLIANCE windows.vmdk: ../test-data/phony-guests/windows.img rm -f $@ $@-t if [ -s $< ]; then \ @@ -487,6 +488,10 @@ windows.vmdk: ../test-data/phony-guests/windows.img else \ touch $@; \ fi +else +windows.vmdk: + touch $@ +endif DISTCLEANFILES += \ windows.vmdk -- 2.17.2
Richard W.M. Jones
2018-Nov-19 19:12 UTC
Re: [Libguestfs] [PATCH] v2v: create an empty windows.vmdk in case of disabled appliance
On Mon, Nov 19, 2018 at 07:35:24PM +0100, Pino Toscano wrote:> In case the appliance is disabled at configure, then all the phony > guests will not be built during the 'make check' time. Since the tests > already handle an empty windows.vmdk fine (in case ntfs-3g is not > available), then just create it empty in this case. > > Reported by: Martin Kletzander. > --- > v2v/Makefile.am | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/v2v/Makefile.am b/v2v/Makefile.am > index a96166e49..d8a7487f3 100644 > --- a/v2v/Makefile.am > +++ b/v2v/Makefile.am > @@ -479,6 +479,7 @@ endif ENABLE_APPLIANCE > > # The VMDK file is used for some -i ova tests. > check_DATA = windows.vmdk > +if ENABLE_APPLIANCE > windows.vmdk: ../test-data/phony-guests/windows.img > rm -f $@ $@-t > if [ -s $< ]; then \ > @@ -487,6 +488,10 @@ windows.vmdk: ../test-data/phony-guests/windows.img > else \ > touch $@; \ > fi > +else > +windows.vmdk: > + touch $@ > +endifACK. Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming and virtualization blog: http://rwmj.wordpress.com virt-df lists disk usage of guests without needing to install any software inside the virtual machine. Supports Linux and Windows. http://people.redhat.com/~rjones/virt-df/