On 01/14/2011 02:48 PM, Matthias Bolte wrote:
Before the security driver was refactored in d6623003 seclabeltest
and
secaatest were basically the same. seclabeltest was meant for SELinux
and secaatest for AppArmor. Both tests exited early when the specific
security driver backend wasn't enabled.
With the new security manager trying to initialize a disabled security
driver backend is an error that can't be distinguished from other errors
anymore. Therefore, the updated seclabeltest just asks for the first
available backend as this will always work even with SELinux and AppArmor
backend being disabled due to the new Nop backend.
Remove the obsolete secaatest and compile and run the seclabeltest
unconditional.
This fixes make check on systems that support AppArmor.
---
tests/Makefile.am | 24 ------------------------
tests/secaatest.c | 45 ---------------------------------------------
2 files changed, 0 insertions(+), 69 deletions(-)
delete mode 100644 tests/secaatest.c
Wow - fixing by pure deletion :)
-if WITH_SECDRIVER_SELINUX
check_PROGRAMS += seclabeltest
-endif
However, I would suggest floating this up to be in the list of
unconditional check_PROGRAMS (just before the if WITH_XEN check).
@@ -191,13 +185,7 @@ if WITH_VMX
TESTS += vmx2xmltest xml2vmxtest
endif
-if WITH_SECDRIVER_SELINUX
TESTS += seclabeltest
-endif
Likewise for floating up to the unconditional TESTS section.
ACK with that nit addressed, even though it ruins the perfect deletion
diffstat.
--
Eric Blake eblake(a)redhat.com +1-801-349-2682
Libvirt virtualization library
http://libvirt.org