diff options
| author | Eric Blake <eblake@redhat.com> | 2012-05-29 15:49:13 -0600 |
|---|---|---|
| committer | Eric Blake <eblake@redhat.com> | 2012-05-30 09:29:32 -0600 |
| commit | fb59cf7a5824b9c876737dcbf6aac97c29b1444a (patch) | |
| tree | 43363ec4d705043fc1294d5562af5ad238962932 /.gitignore | |
| parent | aabf77aa41e9589faa7ce44add87b97f5a6dde2e (diff) | |
| download | libvirt-fb59cf7a5824b9c876737dcbf6aac97c29b1444a.tar.gz | |
build: fix testing of augeas files in VPATH builds
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.
Since the test files are not part of the tarball, we can generate
them into the build dir, but rather than create a subdirectory
just for the test file, it is easier to test them directly in
libvirt.git/src.
* daemon/Makefile.am (AUG_GENTEST): Factor out definition.
(test_libvirtd.aug): Look for correct file.
* src/Makefile.am (AUG_GENTEST): Use $(PERL).
(qemu/test_libvirtd_qemu.aug, lxc/test_libvirtd_lxc.aug)
(locking/test_libvirt_sanlock.aug): Rename to avoid subdirectories.
(check-augeas-qemu, check-augeas-lxc, check-augeas-sanlock): Reflect
location of built tests.
* configure.ac (PERL): Substitute perl.
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 50ff3bf7d2..d535398622 100644 --- a/.gitignore +++ b/.gitignore @@ -109,6 +109,7 @@ /src/remote/*_protocol.[ch] /src/rpc/virkeepaliveprotocol.[ch] /src/rpc/virnetprotocol.[ch] +/src/test_libvirt*.aug /src/util/virkeymaps.h /src/virt-aa-helper /tests/*.log |