[libvirt] [PATCH] Let test_virtlockd.aug find the libvird augeas lense
Otherwise we fail "make check" like: GEN check-augeas-virtlockd Syntax error in lens definition test_virtlockd.aug:8.8-.20:Could not load module Libvirtd for Libvirtd.lns test_virtlockd.aug:8.8-.20:Undefined variable Libvirtd.lns This doesn't show up on systems where libvirtd (and it's lenses) are installed but in a clean chroot. --- src/Makefile.am | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Makefile.am b/src/Makefile.am index d8b943d..bf2ec79 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1675,7 +1675,8 @@ check-augeas-lockd: test_libvirt_lockd.aug check-augeas-virtlockd: test_virtlockd.aug $(AM_V_GEN)if test -x '$(AUGPARSE)'; then \ - '$(AUGPARSE)' -I $(srcdir)/locking test_virtlockd.aug; \ + '$(AUGPARSE)' -I $(top_srcdir)/daemon/ \ + -I $(srcdir)/locking test_virtlockd.aug; \ fi # -- 1.8.4.rc3
On 08/29/2013 11:53 AM, Guido Günther wrote:
Otherwise we fail "make check" like:
GEN check-augeas-virtlockd Syntax error in lens definition test_virtlockd.aug:8.8-.20:Could not load module Libvirtd for Libvirtd.lns test_virtlockd.aug:8.8-.20:Undefined variable Libvirtd.lns
This doesn't show up on systems where libvirtd (and it's lenses) are installed but in a clean chroot. --- src/Makefile.am | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
Seems incomplete. If this is needed for test_virtlockd.aug, it should be needed for ALL our $(AUGPARSE) clients. (test_libvirtd_qemu.aug, test_libvirtd_lxc.aug, ...)
diff --git a/src/Makefile.am b/src/Makefile.am index d8b943d..bf2ec79 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1675,7 +1675,8 @@ check-augeas-lockd: test_libvirt_lockd.aug
check-augeas-virtlockd: test_virtlockd.aug $(AM_V_GEN)if test -x '$(AUGPARSE)'; then \ - '$(AUGPARSE)' -I $(srcdir)/locking test_virtlockd.aug; \ + '$(AUGPARSE)' -I $(top_srcdir)/daemon/ \ + -I $(srcdir)/locking test_virtlockd.aug; \ fi
-- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
On Thu, Aug 29, 2013 at 01:16:02PM -0600, Eric Blake wrote:
On 08/29/2013 11:53 AM, Guido Günther wrote:
Otherwise we fail "make check" like:
GEN check-augeas-virtlockd Syntax error in lens definition test_virtlockd.aug:8.8-.20:Could not load module Libvirtd for Libvirtd.lns test_virtlockd.aug:8.8-.20:Undefined variable Libvirtd.lns
This doesn't show up on systems where libvirtd (and it's lenses) are installed but in a clean chroot. --- src/Makefile.am | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
Seems incomplete. If this is needed for test_virtlockd.aug, it should be needed for ALL our $(AUGPARSE) clients. (test_libvirtd_qemu.aug, test_libvirtd_lxc.aug, ...)
The virtlockd test is the only one refering to Libvirtd from the src/ directory so it's the only one that needs the path adjusted. But while looking at this I wonder why we're using Libvirtd instead of Virtlockd (see my followup). Cheers, -- Guido
diff --git a/src/Makefile.am b/src/Makefile.am index d8b943d..bf2ec79 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1675,7 +1675,8 @@ check-augeas-lockd: test_libvirt_lockd.aug
check-augeas-virtlockd: test_virtlockd.aug $(AM_V_GEN)if test -x '$(AUGPARSE)'; then \ - '$(AUGPARSE)' -I $(srcdir)/locking test_virtlockd.aug; \ + '$(AUGPARSE)' -I $(top_srcdir)/daemon/ \ + -I $(srcdir)/locking test_virtlockd.aug; \ fi
-- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
-- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list
--- src/locking/virtlockd.aug | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/locking/virtlockd.aug b/src/locking/virtlockd.aug index d0b56c2..ec8d2b5 100644 --- a/src/locking/virtlockd.aug +++ b/src/locking/virtlockd.aug @@ -1,6 +1,6 @@ -(* /etc/libvirt/libvirtd.conf *) +(* /etc/libvirt/virtlockd.conf *) -module Libvirtd = +module Virtlockd = autoload xfm let eol = del /[ \t]*\n/ "\n" -- 1.8.4.rc3
On 08/30/2013 05:01 AM, Guido Günther wrote:
--- src/locking/virtlockd.aug | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
ACK, and should be applied before 1.1.2. This makes more sense (glad I asked my question, even if I wasn't on track - because it helped you find the real root cause)
diff --git a/src/locking/virtlockd.aug b/src/locking/virtlockd.aug index d0b56c2..ec8d2b5 100644 --- a/src/locking/virtlockd.aug +++ b/src/locking/virtlockd.aug @@ -1,6 +1,6 @@ -(* /etc/libvirt/libvirtd.conf *) +(* /etc/libvirt/virtlockd.conf *)
-module Libvirtd = +module Virtlockd = autoload xfm
let eol = del /[ \t]*\n/ "\n"
-- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
On Fri, Aug 30, 2013 at 06:37:45AM -0600, Eric Blake wrote:
On 08/30/2013 05:01 AM, Guido Günther wrote:
--- src/locking/virtlockd.aug | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
ACK, and should be applied before 1.1.2. This makes more sense (glad I asked my question, even if I wasn't on track - because it helped you find the real root cause)
Pushed. Thanks, -- Guido
diff --git a/src/locking/virtlockd.aug b/src/locking/virtlockd.aug index d0b56c2..ec8d2b5 100644 --- a/src/locking/virtlockd.aug +++ b/src/locking/virtlockd.aug @@ -1,6 +1,6 @@ -(* /etc/libvirt/libvirtd.conf *) +(* /etc/libvirt/virtlockd.conf *)
-module Libvirtd = +module Virtlockd = autoload xfm
let eol = del /[ \t]*\n/ "\n"
-- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
participants (2)
-
Eric Blake -
Guido Günther