[libvirt] [PATCH 1/2] tests: Run virt-aa-helper-test only when the helper was compiled

Peter Krempa pkrempa at redhat.com
Fri Jul 28 10:18:11 UTC 2017


'virt-aa-helper' is compiled when both WITH_LIBVIRTD and
WITH_SECDRIVER_APPARMOR are defined. The test was run only when
WITH_SECDRIVER_APPARMOR was defined thus causing a build failure when
building without the daemon.
---
 tests/Makefile.am | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 542c4a572..6da3e4778 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -423,10 +423,11 @@ endif ! WITH_LIBVIRTD
 test_programs += objecteventtest

 if WITH_SECDRIVER_APPARMOR
+if WITH_LIBVIRTD
 test_scripts += virt-aa-helper-test
-else ! WITH_SECDRIVER_APPARMOR
+endif WITH_LIBVIRTD
+endif WITH_SECDRIVER_APPARMOR
 EXTRA_DIST += virt-aa-helper-test
-endif ! WITH_SECDRIVER_APPARMOR

 EXTRA_DIST += $(test_scripts)

-- 
2.13.2




More information about the libvir-list mailing list