[libvirt] [PATCH] tests: Move tools under tests/tools/

Michal Privoznik mprivozn at redhat.com
Mon May 6 12:14:48 UTC 2019


On 5/6/19 1:58 PM, Andrea Bolognani wrote:
> On Mon, 2019-05-06 at 10:01 +0200, Michal Privoznik wrote:
> [...]
>> +++ b/configure.ac
>> @@ -925,6 +925,7 @@ AC_CONFIG_FILES([\
>>           include/libvirt/libvirt-common.h \
>>           examples/Makefile \
>>           tests/Makefile \
>> +        tests/tools/Makefile \
> 
> Are we sure we want to have a tests/tools/Makefile.am rather than a
> tests/tools/Makefile.inc.am that we include from tests/Makefile.am
> here? We seem to be going in the former direction, though I'm not
> actually sure what the trade-offs are. CC'ing Dan who introduced
> the Makefile.inc.am files in the first place.

I don't think that will work. The problem is that Makefile.inc.am would 
still be included from tests/Makefile.am and thus all the relative paths 
would be evaluated in relation to that. That is the reason why for 
instance src/qemu/Makefile.inc.am lists source files as qemu/qemu_*.c 
and all the libraries/binaries it builds are placed right under src/.

What I'd like to have is for all these tools to live under separate 
directory - even the compiled binaries.
And this is the point where my automake knowledge was weak enough so the 
only solution I was able to come up with was a separate Makefile.

But I'm open to learn something new.

> 
> [...]
>> +++ b/tests/Makefile.am
>>   EXTRA_DIST += \
>> -	check-file-access.pl \
>> -	file_access_whitelist.txt
>> +	tools/check-file-access.pl \
>> +	tools/file_access_whitelist.txt
> 
> These should go into the new Makefile(.inc).am, just like you've
> done with .valgrind.supp and oomtrace.pl.

Shoot. I wanted to move these. Consider fixed.

Michal




More information about the libvir-list mailing list