NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

Skip check-augeas-lockd when QEMU is disabled

Browse Source 
The check-augeas-lockd test depends on the file
locking/qemu-lockd.conf, so must be skipped when QEMU
is disabled.

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrange 2014-01-23 16:51:46 +00:00
parent 14177ebc24
commit 94e0906839
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Makefile.am
View File

@ -1722,18 +1722,24 @@ else ! WITH_SANLOCK
check-augeas-sanlock: check-augeas-sanlock:
endif ! WITH_SANLOCK endif ! WITH_SANLOCK
if WITH_QEMU
test_libvirt_lockd.aug: locking/test_libvirt_lockd.aug.in \ test_libvirt_lockd.aug: locking/test_libvirt_lockd.aug.in \
locking/qemu-lockd.conf $(AUG_GENTEST) locking/qemu-lockd.conf $(AUG_GENTEST)
$(AM_V_GEN)$(AUG_GENTEST) locking/qemu-lockd.conf $< $@ $(AM_V_GEN)$(AUG_GENTEST) locking/qemu-lockd.conf $< $@
endif WITH_QEMU
test_virtlockd.aug: locking/test_virtlockd.aug.in \ test_virtlockd.aug: locking/test_virtlockd.aug.in \
locking/virtlockd.conf $(AUG_GENTEST) locking/virtlockd.conf $(AUG_GENTEST)
$(AM_V_GEN)$(AUG_GENTEST) $(srcdir)/locking/virtlockd.conf $< $@ $(AM_V_GEN)$(AUG_GENTEST) $(srcdir)/locking/virtlockd.conf $< $@
if WITH_QEMU
check-augeas-lockd: test_libvirt_lockd.aug check-augeas-lockd: test_libvirt_lockd.aug
$(AM_V_GEN)if test -x '$(AUGPARSE)'; then \ $(AM_V_GEN)if test -x '$(AUGPARSE)'; then \
'$(AUGPARSE)' -I $(srcdir)/locking test_libvirt_lockd.aug; \ '$(AUGPARSE)' -I $(srcdir)/locking test_libvirt_lockd.aug; \
fi fi
else ! WITH_QEMU
check-augeas-lockd:
endif ! WITH_QEMU
check-augeas-virtlockd: test_virtlockd.aug check-augeas-virtlockd: test_virtlockd.aug
$(AM_V_GEN)if test -x '$(AUGPARSE)'; then \ $(AM_V_GEN)if test -x '$(AUGPARSE)'; then \