Commit a6e13e1a authored by Andrey Vagin's avatar Andrey Vagin Committed by Pavel Emelyanov

zdtm: execute static/apparmor in CT

Tycho: Also, this makes sense to me now too (it tests the case
       where /sys isn't mounted inside the container, which the
       other patch fixes).
Signed-off-by: 's avatarAndrey Vagin <avagin@openvz.org>
Acked-by: 's avatarTycho Andersen <tycho.andersen@canonical.com>
Signed-off-by: 's avatarPavel Emelyanov <xemul@parallels.com>
parent e3c34988
...@@ -199,6 +199,7 @@ generate_test_list() ...@@ -199,6 +199,7 @@ generate_test_list()
static/remap_dead_pid static/remap_dead_pid
static/poll static/poll
static/apparmor static/apparmor
ns/static/apparmor
" "
TEST_CR_KERNEL=" TEST_CR_KERNEL="
......
...@@ -78,16 +78,6 @@ int main(int argc, char **argv) ...@@ -78,16 +78,6 @@ int main(int argc, char **argv)
{ {
test_init(argc, argv); test_init(argc, argv);
if (access("/sys/kernel/security/apparmor", F_OK) != 0) {
skip("apparmor not enabled\n");
return 1;
}
if (system("apparmor_parser -r apparmor.profile") < 0) {
fail("apparmor profile parse failed");
return -1;
}
setprofile(); setprofile();
test_daemon(); test_daemon();
......
#!/bin/bash #!/bin/bash
test -d /sys/kernel/security/apparmor test -d /sys/kernel/security/apparmor || exit 1
apparmor_parser -r `dirname $0`/apparmor.profile
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment