[libvirt] [PATCH2 2/1] build: fix testing of augeas files in VPATH builds

Martin Kletzander mkletzan at redhat.com
Wed May 30 15:43:03 UTC 2012


On 05/30/2012 05:34 PM, Eric Blake wrote:
> On 05/30/2012 08:39 AM, Martin Kletzander wrote:
>> On 05/30/2012 12:03 AM, Eric Blake wrote:
>>> Without this fix, a VPATH build (such as used by ./autobuild.sh)
>>> fails with messages like:
>>>
>>> make[3]: Entering directory `/home/remote/eblake/libvirt-tmp2/build/daemon'
>>> ../../build-aux/augeas-gentest.pl libvirtd.conf ../../daemon/test_libvirtd.aug.in test_libvirtd.aug
>>> cannot read libvirtd.conf: No such file or directory at ../../build-aux/augeas-gentest.pl line 38.
>>>
> 
>>> -check-augeas-sanlock: locking/test_libvirt_sanlock.aug
>>> +check-augeas-sanlock: test_libvirt_sanlock.aug
>>>  	$(AM_V_GEN)if test -x '$(AUGPARSE)'; then \
>>> -	    '$(AUGPARSE)' -I $(srcdir)/locking \
>>> -	    $(srcdir)/locking/test_libvirt_sanlock.aug; \
>>> +	    '$(AUGPARSE)' -I $(srcdir)/locking test_libvirt_sanlock.aug; \
>>>  	fi
>>>
>>>  #
>>
>> I'm not sure why you use "&& \" to join the lines when there is nothing
>> to share between the processes, but it doesn't hurt. Otherwise it looks
>> like nice cleanup, so ACK from me (if that's enough for you =) ).
> 
> v1 used '&& \' because it did a mkdir in the first command, and the
> second command would fail if the first didn't succeed.  Using '; \' to
> join lines ignores earlier failures.
> 

Oh, sorry, it must have been from the first one and I said that probably
because it could have been split into two lines, but it doesn't matter
now =)

> v2 doesn't use '&& \' for any line joining, so I'm not quite sure where
> your comment came from.
> 
> At any rate, I've now pushed the series, with the configure.ac change
> floated into the second patch per your request.
> 




More information about the libvir-list mailing list