From 27ce962708237d9e3fa85a1a3ae781cfa77cc8b5 Mon Sep 17 00:00:00 2001 From: Kees Cook Date: Mon, 26 Jul 2010 09:26:26 -0700 Subject: [PATCH] Rename "subdomain" to "apparmor" in kernel regression tests. Includes spelling fixes, drops of old documentation, and removal of notes on tests that no longer fail. --- .bzrignore | 120 +++++++++--------- README | 8 +- .../{subdomain => apparmor}/AppArmor.rtf | 0 .../{subdomain => apparmor}/Makefile | 0 .../regression/{subdomain => apparmor}/README | 35 ++--- .../{subdomain => apparmor}/TODO/clone.c | 0 .../{subdomain => apparmor}/TODO/clone.sh | 0 .../{subdomain => apparmor}/TODO/exec_i.c | 0 .../{subdomain => apparmor}/TODO/exec_i.sh | 0 .../{subdomain => apparmor}/TODO/exec_u.c | 0 .../{subdomain => apparmor}/TODO/exec_u.sh | 0 .../{subdomain => apparmor}/TODO/fd-over-unix | 0 .../{subdomain => apparmor}/TODO/globbing | 0 .../{subdomain => apparmor}/TODO/kill.c | 0 .../{subdomain => apparmor}/TODO/kill.sh | 0 .../{subdomain => apparmor}/TODO/pread | 0 .../{subdomain => apparmor}/TODO/readv | 0 .../{subdomain => apparmor}/TODO/sendfile | 0 .../TODO/syscall_others.c | 0 .../{subdomain => apparmor}/TODO/zombie.c | 0 .../{subdomain => apparmor}/TODO/zombie.sh | 0 .../{subdomain => apparmor}/access.c | 0 .../{subdomain => apparmor}/access.sh | 0 .../{subdomain => apparmor}/capabilities.sh | 0 .../{subdomain => apparmor}/changehat.c | 0 .../{subdomain => apparmor}/changehat.h | 0 .../{subdomain => apparmor}/changehat.sh | 0 .../{subdomain => apparmor}/changehat_fail.c | 0 .../{subdomain => apparmor}/changehat_fork.c | 0 .../{subdomain => apparmor}/changehat_fork.sh | 0 .../{subdomain => apparmor}/changehat_misc.c | 0 .../{subdomain => apparmor}/changehat_misc.sh | 0 .../{subdomain => apparmor}/changehat_misc2.c | 0 .../changehat_pthread.c | 0 .../{subdomain => apparmor}/changehat_twice.c | 0 .../changehat_wrapper.c | 0 .../{subdomain => apparmor}/changeprofile.c | 0 .../{subdomain => apparmor}/changeprofile.sh | 0 .../{subdomain => apparmor}/chdir.c | 0 .../{subdomain => apparmor}/chdir.sh | 0 .../{subdomain => apparmor}/chgrp.c | 0 .../{subdomain => apparmor}/chmod.c | 0 .../{subdomain => apparmor}/chown.c | 0 .../{subdomain => apparmor}/clone.c | 0 .../{subdomain => apparmor}/clone.sh | 0 .../{subdomain => apparmor}/coredump.c | 0 .../{subdomain => apparmor}/coredump.sh | 0 .../{subdomain => apparmor}/deleted.c | 0 .../{subdomain => apparmor}/deleted.sh | 0 .../dropprivs_wrapper.c | 0 .../{subdomain => apparmor}/env_check.c | 0 .../{subdomain => apparmor}/env_check.sh | 0 .../{subdomain => apparmor}/environ.c | 0 .../{subdomain => apparmor}/environ.sh | 0 .../{subdomain => apparmor}/epilogue.inc | 0 .../regression/{subdomain => apparmor}/exec.c | 0 .../{subdomain => apparmor}/exec.sh | 0 .../{subdomain => apparmor}/exec_qual.c | 0 .../{subdomain => apparmor}/exec_qual.sh | 0 .../{subdomain => apparmor}/exec_qual2.c | 0 .../{subdomain => apparmor}/fchdir.c | 0 .../{subdomain => apparmor}/fchdir.sh | 0 .../{subdomain => apparmor}/fchgrp.c | 0 .../{subdomain => apparmor}/fchmod.c | 0 .../{subdomain => apparmor}/fchown.c | 0 .../regression/{subdomain => apparmor}/fork.c | 0 .../{subdomain => apparmor}/fork.sh | 0 .../{subdomain => apparmor}/i18n.sh | 0 .../regression/{subdomain => apparmor}/link.c | 0 .../{subdomain => apparmor}/link.sh | 0 .../{subdomain => apparmor}/link_subset.c | 0 .../{subdomain => apparmor}/link_subset.sh | 0 .../{subdomain => apparmor}/longpath.sh | 0 .../{subdomain => apparmor}/mkdir.c | 0 .../{subdomain => apparmor}/mkdir.sh | 0 .../{subdomain => apparmor}/mkprofile.pl | 0 .../regression/{subdomain => apparmor}/mmap.c | 0 .../{subdomain => apparmor}/mmap.sh | 0 .../{subdomain => apparmor}/mount.c | 0 .../{subdomain => apparmor}/mount.sh | 0 .../{subdomain => apparmor}/mult_mount.sh | 0 .../{subdomain => apparmor}/named_pipe.c | 0 .../{subdomain => apparmor}/named_pipe.sh | 0 .../{subdomain => apparmor}/net_raw.c | 0 .../{subdomain => apparmor}/net_raw.sh | 0 .../{subdomain => apparmor}/netdomain/README | 0 .../netdomain/config/default.exp | 0 .../netdomain/config/unix.exp | 0 .../netdomain/config/unknown.exp | 0 .../netdomain/lib/netdomain_init.exp | 0 .../netdomain/netdomain.test/multi_test.exp | 0 .../test_multi/output/tcp_accept.receive.out | 0 .../test_multi/output/tcp_accept.send.out | 0 .../test_multi/output/tcp_connect.receive.out | 0 .../test_multi/output/tcp_connect.send.out | 0 .../test_multi/output/udp_receive.receive.out | 0 .../test_multi/output/udp_receive.send.out | 0 .../test_multi/output/udp_send.receive.out | 0 .../test_multi/output/udp_send.send.out | 0 .../netdomain/test_multi/tcp_accept.testcase | 0 .../netdomain/test_multi/tcp_connect.testcase | 0 .../test_multi/test_multi.generic-profile | 0 .../netdomain/test_multi/udp_receive.testcase | 0 .../netdomain/test_multi/udp_send.testcase | 0 .../netdomain/test_multi_receive.c | 0 .../netdomain/test_multi_send.c | 0 .../regression/{subdomain => apparmor}/open.c | 0 .../{subdomain => apparmor}/open.sh | 0 .../{subdomain => apparmor}/openat.c | 0 .../{subdomain => apparmor}/openat.sh | 0 .../{subdomain => apparmor}/owlsm.sh | 0 .../regression/{subdomain => apparmor}/pipe.c | 0 .../{subdomain => apparmor}/pipe.sh | 0 .../{subdomain => apparmor}/prologue.inc | 0 .../{subdomain => apparmor}/ptrace.c | 0 .../{subdomain => apparmor}/ptrace.sh | 0 .../{subdomain => apparmor}/ptrace_helper.c | 0 .../{subdomain => apparmor}/pwrite.c | 0 .../{subdomain => apparmor}/pwrite.sh | 0 .../{subdomain => apparmor}/readdir.c | 0 .../{subdomain => apparmor}/readdir.sh | 0 .../{subdomain => apparmor}/regex.sh | 0 .../{subdomain => apparmor}/rename.c | 0 .../{subdomain => apparmor}/rename.sh | 0 tests/regression/{subdomain => apparmor}/rw.c | 0 .../regression/{subdomain => apparmor}/rw.sh | 0 .../scripts/make_tar.sh | 0 .../scripts/pull_metadata.pl | 0 .../{subdomain => apparmor}/sd_flags.sh | 0 .../{subdomain => apparmor}/setattr.sh | 0 .../{subdomain => apparmor}/strace.sh | 0 .../regression/{subdomain => apparmor}/swap.c | 0 .../{subdomain => apparmor}/swap.sh | 0 .../{subdomain => apparmor}/symlink.c | 0 .../{subdomain => apparmor}/symlink.sh | 0 .../{subdomain => apparmor}/syscall.sh | 0 .../{subdomain => apparmor}/syscall_chroot.c | 0 .../{subdomain => apparmor}/syscall_ioperm.c | 0 .../{subdomain => apparmor}/syscall_iopl.c | 0 .../{subdomain => apparmor}/syscall_mknod.c | 0 .../syscall_mlockall.c | 0 .../{subdomain => apparmor}/syscall_ptrace.c | 0 .../syscall_query_module.c | 0 .../{subdomain => apparmor}/syscall_reboot.c | 0 .../syscall_setdomainname.c | 0 .../syscall_sethostname.c | 0 .../syscall_setpriority.c | 0 .../syscall_setscheduler.c | 0 .../{subdomain => apparmor}/syscall_sysctl.c | 0 .../{subdomain => apparmor}/syscall_sysctl.sh | 0 .../{subdomain => apparmor}/sysctl_proc.c | 0 .../regression/{subdomain => apparmor}/tcp.c | 0 .../regression/{subdomain => apparmor}/tcp.sh | 0 .../{subdomain => apparmor}/unix_fd_client.c | 0 .../{subdomain => apparmor}/unix_fd_server.c | 0 .../{subdomain => apparmor}/unix_fd_server.sh | 0 .../{subdomain => apparmor}/unlink.c | 0 .../{subdomain => apparmor}/unlink.sh | 0 .../{subdomain => apparmor}/uservars.inc | 0 .../{subdomain => apparmor}/xattrs.c | 0 .../{subdomain => apparmor}/xattrs.sh | 0 161 files changed, 72 insertions(+), 91 deletions(-) rename tests/regression/{subdomain => apparmor}/AppArmor.rtf (100%) rename tests/regression/{subdomain => apparmor}/Makefile (100%) rename tests/regression/{subdomain => apparmor}/README (87%) rename tests/regression/{subdomain => apparmor}/TODO/clone.c (100%) rename tests/regression/{subdomain => apparmor}/TODO/clone.sh (100%) rename tests/regression/{subdomain => apparmor}/TODO/exec_i.c (100%) rename tests/regression/{subdomain => apparmor}/TODO/exec_i.sh (100%) rename tests/regression/{subdomain => apparmor}/TODO/exec_u.c (100%) rename tests/regression/{subdomain => apparmor}/TODO/exec_u.sh (100%) rename tests/regression/{subdomain => apparmor}/TODO/fd-over-unix (100%) rename tests/regression/{subdomain => apparmor}/TODO/globbing (100%) rename tests/regression/{subdomain => apparmor}/TODO/kill.c (100%) rename tests/regression/{subdomain => apparmor}/TODO/kill.sh (100%) rename tests/regression/{subdomain => apparmor}/TODO/pread (100%) rename tests/regression/{subdomain => apparmor}/TODO/readv (100%) rename tests/regression/{subdomain => apparmor}/TODO/sendfile (100%) rename tests/regression/{subdomain => apparmor}/TODO/syscall_others.c (100%) rename tests/regression/{subdomain => apparmor}/TODO/zombie.c (100%) rename tests/regression/{subdomain => apparmor}/TODO/zombie.sh (100%) rename tests/regression/{subdomain => apparmor}/access.c (100%) rename tests/regression/{subdomain => apparmor}/access.sh (100%) rename tests/regression/{subdomain => apparmor}/capabilities.sh (100%) rename tests/regression/{subdomain => apparmor}/changehat.c (100%) rename tests/regression/{subdomain => apparmor}/changehat.h (100%) rename tests/regression/{subdomain => apparmor}/changehat.sh (100%) rename tests/regression/{subdomain => apparmor}/changehat_fail.c (100%) rename tests/regression/{subdomain => apparmor}/changehat_fork.c (100%) rename tests/regression/{subdomain => apparmor}/changehat_fork.sh (100%) rename tests/regression/{subdomain => apparmor}/changehat_misc.c (100%) rename tests/regression/{subdomain => apparmor}/changehat_misc.sh (100%) rename tests/regression/{subdomain => apparmor}/changehat_misc2.c (100%) rename tests/regression/{subdomain => apparmor}/changehat_pthread.c (100%) rename tests/regression/{subdomain => apparmor}/changehat_twice.c (100%) rename tests/regression/{subdomain => apparmor}/changehat_wrapper.c (100%) rename tests/regression/{subdomain => apparmor}/changeprofile.c (100%) rename tests/regression/{subdomain => apparmor}/changeprofile.sh (100%) rename tests/regression/{subdomain => apparmor}/chdir.c (100%) rename tests/regression/{subdomain => apparmor}/chdir.sh (100%) rename tests/regression/{subdomain => apparmor}/chgrp.c (100%) rename tests/regression/{subdomain => apparmor}/chmod.c (100%) rename tests/regression/{subdomain => apparmor}/chown.c (100%) rename tests/regression/{subdomain => apparmor}/clone.c (100%) rename tests/regression/{subdomain => apparmor}/clone.sh (100%) rename tests/regression/{subdomain => apparmor}/coredump.c (100%) rename tests/regression/{subdomain => apparmor}/coredump.sh (100%) rename tests/regression/{subdomain => apparmor}/deleted.c (100%) rename tests/regression/{subdomain => apparmor}/deleted.sh (100%) rename tests/regression/{subdomain => apparmor}/dropprivs_wrapper.c (100%) rename tests/regression/{subdomain => apparmor}/env_check.c (100%) rename tests/regression/{subdomain => apparmor}/env_check.sh (100%) rename tests/regression/{subdomain => apparmor}/environ.c (100%) rename tests/regression/{subdomain => apparmor}/environ.sh (100%) rename tests/regression/{subdomain => apparmor}/epilogue.inc (100%) rename tests/regression/{subdomain => apparmor}/exec.c (100%) rename tests/regression/{subdomain => apparmor}/exec.sh (100%) rename tests/regression/{subdomain => apparmor}/exec_qual.c (100%) rename tests/regression/{subdomain => apparmor}/exec_qual.sh (100%) rename tests/regression/{subdomain => apparmor}/exec_qual2.c (100%) rename tests/regression/{subdomain => apparmor}/fchdir.c (100%) rename tests/regression/{subdomain => apparmor}/fchdir.sh (100%) rename tests/regression/{subdomain => apparmor}/fchgrp.c (100%) rename tests/regression/{subdomain => apparmor}/fchmod.c (100%) rename tests/regression/{subdomain => apparmor}/fchown.c (100%) rename tests/regression/{subdomain => apparmor}/fork.c (100%) rename tests/regression/{subdomain => apparmor}/fork.sh (100%) rename tests/regression/{subdomain => apparmor}/i18n.sh (100%) rename tests/regression/{subdomain => apparmor}/link.c (100%) rename tests/regression/{subdomain => apparmor}/link.sh (100%) rename tests/regression/{subdomain => apparmor}/link_subset.c (100%) rename tests/regression/{subdomain => apparmor}/link_subset.sh (100%) rename tests/regression/{subdomain => apparmor}/longpath.sh (100%) rename tests/regression/{subdomain => apparmor}/mkdir.c (100%) rename tests/regression/{subdomain => apparmor}/mkdir.sh (100%) rename tests/regression/{subdomain => apparmor}/mkprofile.pl (100%) rename tests/regression/{subdomain => apparmor}/mmap.c (100%) rename tests/regression/{subdomain => apparmor}/mmap.sh (100%) rename tests/regression/{subdomain => apparmor}/mount.c (100%) rename tests/regression/{subdomain => apparmor}/mount.sh (100%) rename tests/regression/{subdomain => apparmor}/mult_mount.sh (100%) rename tests/regression/{subdomain => apparmor}/named_pipe.c (100%) rename tests/regression/{subdomain => apparmor}/named_pipe.sh (100%) rename tests/regression/{subdomain => apparmor}/net_raw.c (100%) rename tests/regression/{subdomain => apparmor}/net_raw.sh (100%) rename tests/regression/{subdomain => apparmor}/netdomain/README (100%) rename tests/regression/{subdomain => apparmor}/netdomain/config/default.exp (100%) rename tests/regression/{subdomain => apparmor}/netdomain/config/unix.exp (100%) rename tests/regression/{subdomain => apparmor}/netdomain/config/unknown.exp (100%) rename tests/regression/{subdomain => apparmor}/netdomain/lib/netdomain_init.exp (100%) rename tests/regression/{subdomain => apparmor}/netdomain/netdomain.test/multi_test.exp (100%) rename tests/regression/{subdomain => apparmor}/netdomain/test_multi/output/tcp_accept.receive.out (100%) rename tests/regression/{subdomain => apparmor}/netdomain/test_multi/output/tcp_accept.send.out (100%) rename tests/regression/{subdomain => apparmor}/netdomain/test_multi/output/tcp_connect.receive.out (100%) rename tests/regression/{subdomain => apparmor}/netdomain/test_multi/output/tcp_connect.send.out (100%) rename tests/regression/{subdomain => apparmor}/netdomain/test_multi/output/udp_receive.receive.out (100%) rename tests/regression/{subdomain => apparmor}/netdomain/test_multi/output/udp_receive.send.out (100%) rename tests/regression/{subdomain => apparmor}/netdomain/test_multi/output/udp_send.receive.out (100%) rename tests/regression/{subdomain => apparmor}/netdomain/test_multi/output/udp_send.send.out (100%) rename tests/regression/{subdomain => apparmor}/netdomain/test_multi/tcp_accept.testcase (100%) rename tests/regression/{subdomain => apparmor}/netdomain/test_multi/tcp_connect.testcase (100%) rename tests/regression/{subdomain => apparmor}/netdomain/test_multi/test_multi.generic-profile (100%) rename tests/regression/{subdomain => apparmor}/netdomain/test_multi/udp_receive.testcase (100%) rename tests/regression/{subdomain => apparmor}/netdomain/test_multi/udp_send.testcase (100%) rename tests/regression/{subdomain => apparmor}/netdomain/test_multi_receive.c (100%) rename tests/regression/{subdomain => apparmor}/netdomain/test_multi_send.c (100%) rename tests/regression/{subdomain => apparmor}/open.c (100%) rename tests/regression/{subdomain => apparmor}/open.sh (100%) rename tests/regression/{subdomain => apparmor}/openat.c (100%) rename tests/regression/{subdomain => apparmor}/openat.sh (100%) rename tests/regression/{subdomain => apparmor}/owlsm.sh (100%) rename tests/regression/{subdomain => apparmor}/pipe.c (100%) rename tests/regression/{subdomain => apparmor}/pipe.sh (100%) rename tests/regression/{subdomain => apparmor}/prologue.inc (100%) rename tests/regression/{subdomain => apparmor}/ptrace.c (100%) rename tests/regression/{subdomain => apparmor}/ptrace.sh (100%) rename tests/regression/{subdomain => apparmor}/ptrace_helper.c (100%) rename tests/regression/{subdomain => apparmor}/pwrite.c (100%) rename tests/regression/{subdomain => apparmor}/pwrite.sh (100%) rename tests/regression/{subdomain => apparmor}/readdir.c (100%) rename tests/regression/{subdomain => apparmor}/readdir.sh (100%) rename tests/regression/{subdomain => apparmor}/regex.sh (100%) rename tests/regression/{subdomain => apparmor}/rename.c (100%) rename tests/regression/{subdomain => apparmor}/rename.sh (100%) rename tests/regression/{subdomain => apparmor}/rw.c (100%) rename tests/regression/{subdomain => apparmor}/rw.sh (100%) rename tests/regression/{subdomain => apparmor}/scripts/make_tar.sh (100%) rename tests/regression/{subdomain => apparmor}/scripts/pull_metadata.pl (100%) rename tests/regression/{subdomain => apparmor}/sd_flags.sh (100%) rename tests/regression/{subdomain => apparmor}/setattr.sh (100%) rename tests/regression/{subdomain => apparmor}/strace.sh (100%) rename tests/regression/{subdomain => apparmor}/swap.c (100%) rename tests/regression/{subdomain => apparmor}/swap.sh (100%) rename tests/regression/{subdomain => apparmor}/symlink.c (100%) rename tests/regression/{subdomain => apparmor}/symlink.sh (100%) rename tests/regression/{subdomain => apparmor}/syscall.sh (100%) rename tests/regression/{subdomain => apparmor}/syscall_chroot.c (100%) rename tests/regression/{subdomain => apparmor}/syscall_ioperm.c (100%) rename tests/regression/{subdomain => apparmor}/syscall_iopl.c (100%) rename tests/regression/{subdomain => apparmor}/syscall_mknod.c (100%) rename tests/regression/{subdomain => apparmor}/syscall_mlockall.c (100%) rename tests/regression/{subdomain => apparmor}/syscall_ptrace.c (100%) rename tests/regression/{subdomain => apparmor}/syscall_query_module.c (100%) rename tests/regression/{subdomain => apparmor}/syscall_reboot.c (100%) rename tests/regression/{subdomain => apparmor}/syscall_setdomainname.c (100%) rename tests/regression/{subdomain => apparmor}/syscall_sethostname.c (100%) rename tests/regression/{subdomain => apparmor}/syscall_setpriority.c (100%) rename tests/regression/{subdomain => apparmor}/syscall_setscheduler.c (100%) rename tests/regression/{subdomain => apparmor}/syscall_sysctl.c (100%) rename tests/regression/{subdomain => apparmor}/syscall_sysctl.sh (100%) rename tests/regression/{subdomain => apparmor}/sysctl_proc.c (100%) rename tests/regression/{subdomain => apparmor}/tcp.c (100%) rename tests/regression/{subdomain => apparmor}/tcp.sh (100%) rename tests/regression/{subdomain => apparmor}/unix_fd_client.c (100%) rename tests/regression/{subdomain => apparmor}/unix_fd_server.c (100%) rename tests/regression/{subdomain => apparmor}/unix_fd_server.sh (100%) rename tests/regression/{subdomain => apparmor}/unlink.c (100%) rename tests/regression/{subdomain => apparmor}/unlink.sh (100%) rename tests/regression/{subdomain => apparmor}/uservars.inc (100%) rename tests/regression/{subdomain => apparmor}/xattrs.c (100%) rename tests/regression/{subdomain => apparmor}/xattrs.sh (100%) diff --git a/.bzrignore b/.bzrignore index db41e47ba..433cce83d 100644 --- a/.bzrignore +++ b/.bzrignore @@ -177,63 +177,63 @@ utils/po/xh.mo utils/po/zh_CN.mo utils/po/zh_TW.mo utils/po/zu.mo -tests/regression/subdomain/access -tests/regression/subdomain/changehat -tests/regression/subdomain/changehat_fail -tests/regression/subdomain/changehat_fork -tests/regression/subdomain/changehat_misc -tests/regression/subdomain/changehat_misc2 -tests/regression/subdomain/changehat_pthread -tests/regression/subdomain/changehat_twice -tests/regression/subdomain/changehat_wrapper -tests/regression/subdomain/changeprofile -tests/regression/subdomain/chdir -tests/regression/subdomain/chgrp -tests/regression/subdomain/chmod -tests/regression/subdomain/chown -tests/regression/subdomain/clone -tests/regression/subdomain/deleted -tests/regression/subdomain/env_check -tests/regression/subdomain/environ -tests/regression/subdomain/exec -tests/regression/subdomain/exec_qual -tests/regression/subdomain/exec_qual2 -tests/regression/subdomain/fchdir -tests/regression/subdomain/fchgrp -tests/regression/subdomain/fchmod -tests/regression/subdomain/fchown -tests/regression/subdomain/fork -tests/regression/subdomain/link -tests/regression/subdomain/link_subset -tests/regression/subdomain/mkdir -tests/regression/subdomain/mmap -tests/regression/subdomain/mount -tests/regression/subdomain/named_pipe -tests/regression/subdomain/net_raw -tests/regression/subdomain/open -tests/regression/subdomain/openat -tests/regression/subdomain/pipe -tests/regression/subdomain/ptrace -tests/regression/subdomain/ptrace_helper -tests/regression/subdomain/pwrite -tests/regression/subdomain/readdir -tests/regression/subdomain/rename -tests/regression/subdomain/rw -tests/regression/subdomain/swap -tests/regression/subdomain/symlink -tests/regression/subdomain/syscall_chroot -tests/regression/subdomain/syscall_mknod -tests/regression/subdomain/syscall_mlockall -tests/regression/subdomain/syscall_ptrace -tests/regression/subdomain/syscall_reboot -tests/regression/subdomain/syscall_setdomainname -tests/regression/subdomain/syscall_sethostname -tests/regression/subdomain/syscall_setpriority -tests/regression/subdomain/syscall_setscheduler -tests/regression/subdomain/syscall_sysctl -tests/regression/subdomain/sysctl_proc -tests/regression/subdomain/tcp -tests/regression/subdomain/unix_fd_client -tests/regression/subdomain/unix_fd_server -tests/regression/subdomain/unlink -tests/regression/subdomain/xattrs +tests/regression/apparmor/access +tests/regression/apparmor/changehat +tests/regression/apparmor/changehat_fail +tests/regression/apparmor/changehat_fork +tests/regression/apparmor/changehat_misc +tests/regression/apparmor/changehat_misc2 +tests/regression/apparmor/changehat_pthread +tests/regression/apparmor/changehat_twice +tests/regression/apparmor/changehat_wrapper +tests/regression/apparmor/changeprofile +tests/regression/apparmor/chdir +tests/regression/apparmor/chgrp +tests/regression/apparmor/chmod +tests/regression/apparmor/chown +tests/regression/apparmor/clone +tests/regression/apparmor/deleted +tests/regression/apparmor/env_check +tests/regression/apparmor/environ +tests/regression/apparmor/exec +tests/regression/apparmor/exec_qual +tests/regression/apparmor/exec_qual2 +tests/regression/apparmor/fchdir +tests/regression/apparmor/fchgrp +tests/regression/apparmor/fchmod +tests/regression/apparmor/fchown +tests/regression/apparmor/fork +tests/regression/apparmor/link +tests/regression/apparmor/link_subset +tests/regression/apparmor/mkdir +tests/regression/apparmor/mmap +tests/regression/apparmor/mount +tests/regression/apparmor/named_pipe +tests/regression/apparmor/net_raw +tests/regression/apparmor/open +tests/regression/apparmor/openat +tests/regression/apparmor/pipe +tests/regression/apparmor/ptrace +tests/regression/apparmor/ptrace_helper +tests/regression/apparmor/pwrite +tests/regression/apparmor/readdir +tests/regression/apparmor/rename +tests/regression/apparmor/rw +tests/regression/apparmor/swap +tests/regression/apparmor/symlink +tests/regression/apparmor/syscall_chroot +tests/regression/apparmor/syscall_mknod +tests/regression/apparmor/syscall_mlockall +tests/regression/apparmor/syscall_ptrace +tests/regression/apparmor/syscall_reboot +tests/regression/apparmor/syscall_setdomainname +tests/regression/apparmor/syscall_sethostname +tests/regression/apparmor/syscall_setpriority +tests/regression/apparmor/syscall_setscheduler +tests/regression/apparmor/syscall_sysctl +tests/regression/apparmor/sysctl_proc +tests/regression/apparmor/tcp +tests/regression/apparmor/unix_fd_client +tests/regression/apparmor/unix_fd_server +tests/regression/apparmor/unlink +tests/regression/apparmor/xattrs diff --git a/README b/README index 91e0c3aca..37f12d7e2 100644 --- a/README +++ b/README @@ -98,10 +98,10 @@ location and how to run them. Regression tests ---------------- For details on structure and adding tests, see -tests/regression/subdomain/README. +tests/regression/apparmor/README. To run: -$ cd tests/regression/subdomain (requires root) +$ cd tests/regression/apparmor (requires root) $ make $ sudo make tests $ sudo bash open.sh -r # runs and saves the last testcase from open.sh @@ -119,14 +119,14 @@ $ make tests Libapparmor ----------- -For detail son structure and adding tests, see libraries/libapparmor/README. +For details on structure and adding tests, see libraries/libapparmor/README. $ cd libraries/libapparmor $ make check Stress Tests ------------ -To run subdomain stress tests: +To run AppArmor stress tests: $ make all Use these: diff --git a/tests/regression/subdomain/AppArmor.rtf b/tests/regression/apparmor/AppArmor.rtf similarity index 100% rename from tests/regression/subdomain/AppArmor.rtf rename to tests/regression/apparmor/AppArmor.rtf diff --git a/tests/regression/subdomain/Makefile b/tests/regression/apparmor/Makefile similarity index 100% rename from tests/regression/subdomain/Makefile rename to tests/regression/apparmor/Makefile diff --git a/tests/regression/subdomain/README b/tests/regression/apparmor/README similarity index 87% rename from tests/regression/subdomain/README rename to tests/regression/apparmor/README index 7fcb1affc..0fe3a6061 100644 --- a/tests/regression/subdomain/README +++ b/tests/regression/apparmor/README @@ -1,10 +1,10 @@ Running tests ============= -Type "make tests" at the shell prompt, this will make the subprograms -and run the tests. +Type "sudo make tests" at the shell prompt, this will make the +subprograms and run the tests. -You must be root to execute make tests (a requirement of subdomain). +You must be root to execute "make tests" (a requirement of AppArmor). (There is also a 'make alltests', which adds a test for bug that, when triggered, would cause the kernel to crash.) @@ -29,7 +29,7 @@ Changing environment variables Common user changeable environment variables are stored in the file 'uservars.inc'. Currently the path to the tmp directory, the path -to the subdomain_parser executable, and any additional arguments to give +to the apparmor_parser executable, and any additional arguments to give to the parser are specified in this configuration file. (Note: the tmp directory specified in uservars.inc will have an added @@ -66,7 +66,7 @@ test harness will abort processing further tests and the contents of the directory will contain the files for the failed subtest. It may be necessary to create certain temp files in this directory in order to -have the test function correctly, see the subdomain profile 'profile' in the +have the test function correctly, see the AppArmor profile 'profile' in the directory in order to determine which files may need to be created to support the executable. @@ -155,7 +155,7 @@ requiring signal passing) bin=$pwd - + . $bin/prologue.inc - + genprofile $file:$badperm @@ -183,16 +183,11 @@ requiring signal passing) -Additional documentation -======================== - -See the file 'subdomain_test.txt' - Supporting files ================ strace.sh Not a test harness, used to support strace testing. -mkprofile.sh Not a test harness, used to generate subdomain profiles. +mkprofile.sh Not a test harness, used to generate AppArmor profiles. prologue.inc Must be dotted (included) into the test harness. Provides support routines. epilogue.inc Cleanup support, automatically called upon successful or @@ -222,17 +217,3 @@ Current failures This is not an error, rather a sign that bash noticed the kernel had killed a process which was attempting to use a bogus MAGIC number. Alas, there is no way to get bash to not print this diagnostic - -3) Ptrace - Error: open passed. Test 'STRACE OPEN (x confinement)' - was expected to 'fail' - - Regression from 2.4.18 to 2.4.20. (We aren't sure on the first - endpoint, and the problem still happens in 2.4.20-20_imnx_10smp.) - -4) Open - Error: open passed. Test 'OPEN W (create)' was expected to 'fail' - - LSM issue. Flags passed to inode_permission are 0 if O_CREAT is used to - open file. Need to submit a patch to inode_create hook to receive the - O_RDWR flags. See https://bugs.wirex.com/show_bug.cgi?id=2885 diff --git a/tests/regression/subdomain/TODO/clone.c b/tests/regression/apparmor/TODO/clone.c similarity index 100% rename from tests/regression/subdomain/TODO/clone.c rename to tests/regression/apparmor/TODO/clone.c diff --git a/tests/regression/subdomain/TODO/clone.sh b/tests/regression/apparmor/TODO/clone.sh similarity index 100% rename from tests/regression/subdomain/TODO/clone.sh rename to tests/regression/apparmor/TODO/clone.sh diff --git a/tests/regression/subdomain/TODO/exec_i.c b/tests/regression/apparmor/TODO/exec_i.c similarity index 100% rename from tests/regression/subdomain/TODO/exec_i.c rename to tests/regression/apparmor/TODO/exec_i.c diff --git a/tests/regression/subdomain/TODO/exec_i.sh b/tests/regression/apparmor/TODO/exec_i.sh similarity index 100% rename from tests/regression/subdomain/TODO/exec_i.sh rename to tests/regression/apparmor/TODO/exec_i.sh diff --git a/tests/regression/subdomain/TODO/exec_u.c b/tests/regression/apparmor/TODO/exec_u.c similarity index 100% rename from tests/regression/subdomain/TODO/exec_u.c rename to tests/regression/apparmor/TODO/exec_u.c diff --git a/tests/regression/subdomain/TODO/exec_u.sh b/tests/regression/apparmor/TODO/exec_u.sh similarity index 100% rename from tests/regression/subdomain/TODO/exec_u.sh rename to tests/regression/apparmor/TODO/exec_u.sh diff --git a/tests/regression/subdomain/TODO/fd-over-unix b/tests/regression/apparmor/TODO/fd-over-unix similarity index 100% rename from tests/regression/subdomain/TODO/fd-over-unix rename to tests/regression/apparmor/TODO/fd-over-unix diff --git a/tests/regression/subdomain/TODO/globbing b/tests/regression/apparmor/TODO/globbing similarity index 100% rename from tests/regression/subdomain/TODO/globbing rename to tests/regression/apparmor/TODO/globbing diff --git a/tests/regression/subdomain/TODO/kill.c b/tests/regression/apparmor/TODO/kill.c similarity index 100% rename from tests/regression/subdomain/TODO/kill.c rename to tests/regression/apparmor/TODO/kill.c diff --git a/tests/regression/subdomain/TODO/kill.sh b/tests/regression/apparmor/TODO/kill.sh similarity index 100% rename from tests/regression/subdomain/TODO/kill.sh rename to tests/regression/apparmor/TODO/kill.sh diff --git a/tests/regression/subdomain/TODO/pread b/tests/regression/apparmor/TODO/pread similarity index 100% rename from tests/regression/subdomain/TODO/pread rename to tests/regression/apparmor/TODO/pread diff --git a/tests/regression/subdomain/TODO/readv b/tests/regression/apparmor/TODO/readv similarity index 100% rename from tests/regression/subdomain/TODO/readv rename to tests/regression/apparmor/TODO/readv diff --git a/tests/regression/subdomain/TODO/sendfile b/tests/regression/apparmor/TODO/sendfile similarity index 100% rename from tests/regression/subdomain/TODO/sendfile rename to tests/regression/apparmor/TODO/sendfile diff --git a/tests/regression/subdomain/TODO/syscall_others.c b/tests/regression/apparmor/TODO/syscall_others.c similarity index 100% rename from tests/regression/subdomain/TODO/syscall_others.c rename to tests/regression/apparmor/TODO/syscall_others.c diff --git a/tests/regression/subdomain/TODO/zombie.c b/tests/regression/apparmor/TODO/zombie.c similarity index 100% rename from tests/regression/subdomain/TODO/zombie.c rename to tests/regression/apparmor/TODO/zombie.c diff --git a/tests/regression/subdomain/TODO/zombie.sh b/tests/regression/apparmor/TODO/zombie.sh similarity index 100% rename from tests/regression/subdomain/TODO/zombie.sh rename to tests/regression/apparmor/TODO/zombie.sh diff --git a/tests/regression/subdomain/access.c b/tests/regression/apparmor/access.c similarity index 100% rename from tests/regression/subdomain/access.c rename to tests/regression/apparmor/access.c diff --git a/tests/regression/subdomain/access.sh b/tests/regression/apparmor/access.sh similarity index 100% rename from tests/regression/subdomain/access.sh rename to tests/regression/apparmor/access.sh diff --git a/tests/regression/subdomain/capabilities.sh b/tests/regression/apparmor/capabilities.sh similarity index 100% rename from tests/regression/subdomain/capabilities.sh rename to tests/regression/apparmor/capabilities.sh diff --git a/tests/regression/subdomain/changehat.c b/tests/regression/apparmor/changehat.c similarity index 100% rename from tests/regression/subdomain/changehat.c rename to tests/regression/apparmor/changehat.c diff --git a/tests/regression/subdomain/changehat.h b/tests/regression/apparmor/changehat.h similarity index 100% rename from tests/regression/subdomain/changehat.h rename to tests/regression/apparmor/changehat.h diff --git a/tests/regression/subdomain/changehat.sh b/tests/regression/apparmor/changehat.sh similarity index 100% rename from tests/regression/subdomain/changehat.sh rename to tests/regression/apparmor/changehat.sh diff --git a/tests/regression/subdomain/changehat_fail.c b/tests/regression/apparmor/changehat_fail.c similarity index 100% rename from tests/regression/subdomain/changehat_fail.c rename to tests/regression/apparmor/changehat_fail.c diff --git a/tests/regression/subdomain/changehat_fork.c b/tests/regression/apparmor/changehat_fork.c similarity index 100% rename from tests/regression/subdomain/changehat_fork.c rename to tests/regression/apparmor/changehat_fork.c diff --git a/tests/regression/subdomain/changehat_fork.sh b/tests/regression/apparmor/changehat_fork.sh similarity index 100% rename from tests/regression/subdomain/changehat_fork.sh rename to tests/regression/apparmor/changehat_fork.sh diff --git a/tests/regression/subdomain/changehat_misc.c b/tests/regression/apparmor/changehat_misc.c similarity index 100% rename from tests/regression/subdomain/changehat_misc.c rename to tests/regression/apparmor/changehat_misc.c diff --git a/tests/regression/subdomain/changehat_misc.sh b/tests/regression/apparmor/changehat_misc.sh similarity index 100% rename from tests/regression/subdomain/changehat_misc.sh rename to tests/regression/apparmor/changehat_misc.sh diff --git a/tests/regression/subdomain/changehat_misc2.c b/tests/regression/apparmor/changehat_misc2.c similarity index 100% rename from tests/regression/subdomain/changehat_misc2.c rename to tests/regression/apparmor/changehat_misc2.c diff --git a/tests/regression/subdomain/changehat_pthread.c b/tests/regression/apparmor/changehat_pthread.c similarity index 100% rename from tests/regression/subdomain/changehat_pthread.c rename to tests/regression/apparmor/changehat_pthread.c diff --git a/tests/regression/subdomain/changehat_twice.c b/tests/regression/apparmor/changehat_twice.c similarity index 100% rename from tests/regression/subdomain/changehat_twice.c rename to tests/regression/apparmor/changehat_twice.c diff --git a/tests/regression/subdomain/changehat_wrapper.c b/tests/regression/apparmor/changehat_wrapper.c similarity index 100% rename from tests/regression/subdomain/changehat_wrapper.c rename to tests/regression/apparmor/changehat_wrapper.c diff --git a/tests/regression/subdomain/changeprofile.c b/tests/regression/apparmor/changeprofile.c similarity index 100% rename from tests/regression/subdomain/changeprofile.c rename to tests/regression/apparmor/changeprofile.c diff --git a/tests/regression/subdomain/changeprofile.sh b/tests/regression/apparmor/changeprofile.sh similarity index 100% rename from tests/regression/subdomain/changeprofile.sh rename to tests/regression/apparmor/changeprofile.sh diff --git a/tests/regression/subdomain/chdir.c b/tests/regression/apparmor/chdir.c similarity index 100% rename from tests/regression/subdomain/chdir.c rename to tests/regression/apparmor/chdir.c diff --git a/tests/regression/subdomain/chdir.sh b/tests/regression/apparmor/chdir.sh similarity index 100% rename from tests/regression/subdomain/chdir.sh rename to tests/regression/apparmor/chdir.sh diff --git a/tests/regression/subdomain/chgrp.c b/tests/regression/apparmor/chgrp.c similarity index 100% rename from tests/regression/subdomain/chgrp.c rename to tests/regression/apparmor/chgrp.c diff --git a/tests/regression/subdomain/chmod.c b/tests/regression/apparmor/chmod.c similarity index 100% rename from tests/regression/subdomain/chmod.c rename to tests/regression/apparmor/chmod.c diff --git a/tests/regression/subdomain/chown.c b/tests/regression/apparmor/chown.c similarity index 100% rename from tests/regression/subdomain/chown.c rename to tests/regression/apparmor/chown.c diff --git a/tests/regression/subdomain/clone.c b/tests/regression/apparmor/clone.c similarity index 100% rename from tests/regression/subdomain/clone.c rename to tests/regression/apparmor/clone.c diff --git a/tests/regression/subdomain/clone.sh b/tests/regression/apparmor/clone.sh similarity index 100% rename from tests/regression/subdomain/clone.sh rename to tests/regression/apparmor/clone.sh diff --git a/tests/regression/subdomain/coredump.c b/tests/regression/apparmor/coredump.c similarity index 100% rename from tests/regression/subdomain/coredump.c rename to tests/regression/apparmor/coredump.c diff --git a/tests/regression/subdomain/coredump.sh b/tests/regression/apparmor/coredump.sh similarity index 100% rename from tests/regression/subdomain/coredump.sh rename to tests/regression/apparmor/coredump.sh diff --git a/tests/regression/subdomain/deleted.c b/tests/regression/apparmor/deleted.c similarity index 100% rename from tests/regression/subdomain/deleted.c rename to tests/regression/apparmor/deleted.c diff --git a/tests/regression/subdomain/deleted.sh b/tests/regression/apparmor/deleted.sh similarity index 100% rename from tests/regression/subdomain/deleted.sh rename to tests/regression/apparmor/deleted.sh diff --git a/tests/regression/subdomain/dropprivs_wrapper.c b/tests/regression/apparmor/dropprivs_wrapper.c similarity index 100% rename from tests/regression/subdomain/dropprivs_wrapper.c rename to tests/regression/apparmor/dropprivs_wrapper.c diff --git a/tests/regression/subdomain/env_check.c b/tests/regression/apparmor/env_check.c similarity index 100% rename from tests/regression/subdomain/env_check.c rename to tests/regression/apparmor/env_check.c diff --git a/tests/regression/subdomain/env_check.sh b/tests/regression/apparmor/env_check.sh similarity index 100% rename from tests/regression/subdomain/env_check.sh rename to tests/regression/apparmor/env_check.sh diff --git a/tests/regression/subdomain/environ.c b/tests/regression/apparmor/environ.c similarity index 100% rename from tests/regression/subdomain/environ.c rename to tests/regression/apparmor/environ.c diff --git a/tests/regression/subdomain/environ.sh b/tests/regression/apparmor/environ.sh similarity index 100% rename from tests/regression/subdomain/environ.sh rename to tests/regression/apparmor/environ.sh diff --git a/tests/regression/subdomain/epilogue.inc b/tests/regression/apparmor/epilogue.inc similarity index 100% rename from tests/regression/subdomain/epilogue.inc rename to tests/regression/apparmor/epilogue.inc diff --git a/tests/regression/subdomain/exec.c b/tests/regression/apparmor/exec.c similarity index 100% rename from tests/regression/subdomain/exec.c rename to tests/regression/apparmor/exec.c diff --git a/tests/regression/subdomain/exec.sh b/tests/regression/apparmor/exec.sh similarity index 100% rename from tests/regression/subdomain/exec.sh rename to tests/regression/apparmor/exec.sh diff --git a/tests/regression/subdomain/exec_qual.c b/tests/regression/apparmor/exec_qual.c similarity index 100% rename from tests/regression/subdomain/exec_qual.c rename to tests/regression/apparmor/exec_qual.c diff --git a/tests/regression/subdomain/exec_qual.sh b/tests/regression/apparmor/exec_qual.sh similarity index 100% rename from tests/regression/subdomain/exec_qual.sh rename to tests/regression/apparmor/exec_qual.sh diff --git a/tests/regression/subdomain/exec_qual2.c b/tests/regression/apparmor/exec_qual2.c similarity index 100% rename from tests/regression/subdomain/exec_qual2.c rename to tests/regression/apparmor/exec_qual2.c diff --git a/tests/regression/subdomain/fchdir.c b/tests/regression/apparmor/fchdir.c similarity index 100% rename from tests/regression/subdomain/fchdir.c rename to tests/regression/apparmor/fchdir.c diff --git a/tests/regression/subdomain/fchdir.sh b/tests/regression/apparmor/fchdir.sh similarity index 100% rename from tests/regression/subdomain/fchdir.sh rename to tests/regression/apparmor/fchdir.sh diff --git a/tests/regression/subdomain/fchgrp.c b/tests/regression/apparmor/fchgrp.c similarity index 100% rename from tests/regression/subdomain/fchgrp.c rename to tests/regression/apparmor/fchgrp.c diff --git a/tests/regression/subdomain/fchmod.c b/tests/regression/apparmor/fchmod.c similarity index 100% rename from tests/regression/subdomain/fchmod.c rename to tests/regression/apparmor/fchmod.c diff --git a/tests/regression/subdomain/fchown.c b/tests/regression/apparmor/fchown.c similarity index 100% rename from tests/regression/subdomain/fchown.c rename to tests/regression/apparmor/fchown.c diff --git a/tests/regression/subdomain/fork.c b/tests/regression/apparmor/fork.c similarity index 100% rename from tests/regression/subdomain/fork.c rename to tests/regression/apparmor/fork.c diff --git a/tests/regression/subdomain/fork.sh b/tests/regression/apparmor/fork.sh similarity index 100% rename from tests/regression/subdomain/fork.sh rename to tests/regression/apparmor/fork.sh diff --git a/tests/regression/subdomain/i18n.sh b/tests/regression/apparmor/i18n.sh similarity index 100% rename from tests/regression/subdomain/i18n.sh rename to tests/regression/apparmor/i18n.sh diff --git a/tests/regression/subdomain/link.c b/tests/regression/apparmor/link.c similarity index 100% rename from tests/regression/subdomain/link.c rename to tests/regression/apparmor/link.c diff --git a/tests/regression/subdomain/link.sh b/tests/regression/apparmor/link.sh similarity index 100% rename from tests/regression/subdomain/link.sh rename to tests/regression/apparmor/link.sh diff --git a/tests/regression/subdomain/link_subset.c b/tests/regression/apparmor/link_subset.c similarity index 100% rename from tests/regression/subdomain/link_subset.c rename to tests/regression/apparmor/link_subset.c diff --git a/tests/regression/subdomain/link_subset.sh b/tests/regression/apparmor/link_subset.sh similarity index 100% rename from tests/regression/subdomain/link_subset.sh rename to tests/regression/apparmor/link_subset.sh diff --git a/tests/regression/subdomain/longpath.sh b/tests/regression/apparmor/longpath.sh similarity index 100% rename from tests/regression/subdomain/longpath.sh rename to tests/regression/apparmor/longpath.sh diff --git a/tests/regression/subdomain/mkdir.c b/tests/regression/apparmor/mkdir.c similarity index 100% rename from tests/regression/subdomain/mkdir.c rename to tests/regression/apparmor/mkdir.c diff --git a/tests/regression/subdomain/mkdir.sh b/tests/regression/apparmor/mkdir.sh similarity index 100% rename from tests/regression/subdomain/mkdir.sh rename to tests/regression/apparmor/mkdir.sh diff --git a/tests/regression/subdomain/mkprofile.pl b/tests/regression/apparmor/mkprofile.pl similarity index 100% rename from tests/regression/subdomain/mkprofile.pl rename to tests/regression/apparmor/mkprofile.pl diff --git a/tests/regression/subdomain/mmap.c b/tests/regression/apparmor/mmap.c similarity index 100% rename from tests/regression/subdomain/mmap.c rename to tests/regression/apparmor/mmap.c diff --git a/tests/regression/subdomain/mmap.sh b/tests/regression/apparmor/mmap.sh similarity index 100% rename from tests/regression/subdomain/mmap.sh rename to tests/regression/apparmor/mmap.sh diff --git a/tests/regression/subdomain/mount.c b/tests/regression/apparmor/mount.c similarity index 100% rename from tests/regression/subdomain/mount.c rename to tests/regression/apparmor/mount.c diff --git a/tests/regression/subdomain/mount.sh b/tests/regression/apparmor/mount.sh similarity index 100% rename from tests/regression/subdomain/mount.sh rename to tests/regression/apparmor/mount.sh diff --git a/tests/regression/subdomain/mult_mount.sh b/tests/regression/apparmor/mult_mount.sh similarity index 100% rename from tests/regression/subdomain/mult_mount.sh rename to tests/regression/apparmor/mult_mount.sh diff --git a/tests/regression/subdomain/named_pipe.c b/tests/regression/apparmor/named_pipe.c similarity index 100% rename from tests/regression/subdomain/named_pipe.c rename to tests/regression/apparmor/named_pipe.c diff --git a/tests/regression/subdomain/named_pipe.sh b/tests/regression/apparmor/named_pipe.sh similarity index 100% rename from tests/regression/subdomain/named_pipe.sh rename to tests/regression/apparmor/named_pipe.sh diff --git a/tests/regression/subdomain/net_raw.c b/tests/regression/apparmor/net_raw.c similarity index 100% rename from tests/regression/subdomain/net_raw.c rename to tests/regression/apparmor/net_raw.c diff --git a/tests/regression/subdomain/net_raw.sh b/tests/regression/apparmor/net_raw.sh similarity index 100% rename from tests/regression/subdomain/net_raw.sh rename to tests/regression/apparmor/net_raw.sh diff --git a/tests/regression/subdomain/netdomain/README b/tests/regression/apparmor/netdomain/README similarity index 100% rename from tests/regression/subdomain/netdomain/README rename to tests/regression/apparmor/netdomain/README diff --git a/tests/regression/subdomain/netdomain/config/default.exp b/tests/regression/apparmor/netdomain/config/default.exp similarity index 100% rename from tests/regression/subdomain/netdomain/config/default.exp rename to tests/regression/apparmor/netdomain/config/default.exp diff --git a/tests/regression/subdomain/netdomain/config/unix.exp b/tests/regression/apparmor/netdomain/config/unix.exp similarity index 100% rename from tests/regression/subdomain/netdomain/config/unix.exp rename to tests/regression/apparmor/netdomain/config/unix.exp diff --git a/tests/regression/subdomain/netdomain/config/unknown.exp b/tests/regression/apparmor/netdomain/config/unknown.exp similarity index 100% rename from tests/regression/subdomain/netdomain/config/unknown.exp rename to tests/regression/apparmor/netdomain/config/unknown.exp diff --git a/tests/regression/subdomain/netdomain/lib/netdomain_init.exp b/tests/regression/apparmor/netdomain/lib/netdomain_init.exp similarity index 100% rename from tests/regression/subdomain/netdomain/lib/netdomain_init.exp rename to tests/regression/apparmor/netdomain/lib/netdomain_init.exp diff --git a/tests/regression/subdomain/netdomain/netdomain.test/multi_test.exp b/tests/regression/apparmor/netdomain/netdomain.test/multi_test.exp similarity index 100% rename from tests/regression/subdomain/netdomain/netdomain.test/multi_test.exp rename to tests/regression/apparmor/netdomain/netdomain.test/multi_test.exp diff --git a/tests/regression/subdomain/netdomain/test_multi/output/tcp_accept.receive.out b/tests/regression/apparmor/netdomain/test_multi/output/tcp_accept.receive.out similarity index 100% rename from tests/regression/subdomain/netdomain/test_multi/output/tcp_accept.receive.out rename to tests/regression/apparmor/netdomain/test_multi/output/tcp_accept.receive.out diff --git a/tests/regression/subdomain/netdomain/test_multi/output/tcp_accept.send.out b/tests/regression/apparmor/netdomain/test_multi/output/tcp_accept.send.out similarity index 100% rename from tests/regression/subdomain/netdomain/test_multi/output/tcp_accept.send.out rename to tests/regression/apparmor/netdomain/test_multi/output/tcp_accept.send.out diff --git a/tests/regression/subdomain/netdomain/test_multi/output/tcp_connect.receive.out b/tests/regression/apparmor/netdomain/test_multi/output/tcp_connect.receive.out similarity index 100% rename from tests/regression/subdomain/netdomain/test_multi/output/tcp_connect.receive.out rename to tests/regression/apparmor/netdomain/test_multi/output/tcp_connect.receive.out diff --git a/tests/regression/subdomain/netdomain/test_multi/output/tcp_connect.send.out b/tests/regression/apparmor/netdomain/test_multi/output/tcp_connect.send.out similarity index 100% rename from tests/regression/subdomain/netdomain/test_multi/output/tcp_connect.send.out rename to tests/regression/apparmor/netdomain/test_multi/output/tcp_connect.send.out diff --git a/tests/regression/subdomain/netdomain/test_multi/output/udp_receive.receive.out b/tests/regression/apparmor/netdomain/test_multi/output/udp_receive.receive.out similarity index 100% rename from tests/regression/subdomain/netdomain/test_multi/output/udp_receive.receive.out rename to tests/regression/apparmor/netdomain/test_multi/output/udp_receive.receive.out diff --git a/tests/regression/subdomain/netdomain/test_multi/output/udp_receive.send.out b/tests/regression/apparmor/netdomain/test_multi/output/udp_receive.send.out similarity index 100% rename from tests/regression/subdomain/netdomain/test_multi/output/udp_receive.send.out rename to tests/regression/apparmor/netdomain/test_multi/output/udp_receive.send.out diff --git a/tests/regression/subdomain/netdomain/test_multi/output/udp_send.receive.out b/tests/regression/apparmor/netdomain/test_multi/output/udp_send.receive.out similarity index 100% rename from tests/regression/subdomain/netdomain/test_multi/output/udp_send.receive.out rename to tests/regression/apparmor/netdomain/test_multi/output/udp_send.receive.out diff --git a/tests/regression/subdomain/netdomain/test_multi/output/udp_send.send.out b/tests/regression/apparmor/netdomain/test_multi/output/udp_send.send.out similarity index 100% rename from tests/regression/subdomain/netdomain/test_multi/output/udp_send.send.out rename to tests/regression/apparmor/netdomain/test_multi/output/udp_send.send.out diff --git a/tests/regression/subdomain/netdomain/test_multi/tcp_accept.testcase b/tests/regression/apparmor/netdomain/test_multi/tcp_accept.testcase similarity index 100% rename from tests/regression/subdomain/netdomain/test_multi/tcp_accept.testcase rename to tests/regression/apparmor/netdomain/test_multi/tcp_accept.testcase diff --git a/tests/regression/subdomain/netdomain/test_multi/tcp_connect.testcase b/tests/regression/apparmor/netdomain/test_multi/tcp_connect.testcase similarity index 100% rename from tests/regression/subdomain/netdomain/test_multi/tcp_connect.testcase rename to tests/regression/apparmor/netdomain/test_multi/tcp_connect.testcase diff --git a/tests/regression/subdomain/netdomain/test_multi/test_multi.generic-profile b/tests/regression/apparmor/netdomain/test_multi/test_multi.generic-profile similarity index 100% rename from tests/regression/subdomain/netdomain/test_multi/test_multi.generic-profile rename to tests/regression/apparmor/netdomain/test_multi/test_multi.generic-profile diff --git a/tests/regression/subdomain/netdomain/test_multi/udp_receive.testcase b/tests/regression/apparmor/netdomain/test_multi/udp_receive.testcase similarity index 100% rename from tests/regression/subdomain/netdomain/test_multi/udp_receive.testcase rename to tests/regression/apparmor/netdomain/test_multi/udp_receive.testcase diff --git a/tests/regression/subdomain/netdomain/test_multi/udp_send.testcase b/tests/regression/apparmor/netdomain/test_multi/udp_send.testcase similarity index 100% rename from tests/regression/subdomain/netdomain/test_multi/udp_send.testcase rename to tests/regression/apparmor/netdomain/test_multi/udp_send.testcase diff --git a/tests/regression/subdomain/netdomain/test_multi_receive.c b/tests/regression/apparmor/netdomain/test_multi_receive.c similarity index 100% rename from tests/regression/subdomain/netdomain/test_multi_receive.c rename to tests/regression/apparmor/netdomain/test_multi_receive.c diff --git a/tests/regression/subdomain/netdomain/test_multi_send.c b/tests/regression/apparmor/netdomain/test_multi_send.c similarity index 100% rename from tests/regression/subdomain/netdomain/test_multi_send.c rename to tests/regression/apparmor/netdomain/test_multi_send.c diff --git a/tests/regression/subdomain/open.c b/tests/regression/apparmor/open.c similarity index 100% rename from tests/regression/subdomain/open.c rename to tests/regression/apparmor/open.c diff --git a/tests/regression/subdomain/open.sh b/tests/regression/apparmor/open.sh similarity index 100% rename from tests/regression/subdomain/open.sh rename to tests/regression/apparmor/open.sh diff --git a/tests/regression/subdomain/openat.c b/tests/regression/apparmor/openat.c similarity index 100% rename from tests/regression/subdomain/openat.c rename to tests/regression/apparmor/openat.c diff --git a/tests/regression/subdomain/openat.sh b/tests/regression/apparmor/openat.sh similarity index 100% rename from tests/regression/subdomain/openat.sh rename to tests/regression/apparmor/openat.sh diff --git a/tests/regression/subdomain/owlsm.sh b/tests/regression/apparmor/owlsm.sh similarity index 100% rename from tests/regression/subdomain/owlsm.sh rename to tests/regression/apparmor/owlsm.sh diff --git a/tests/regression/subdomain/pipe.c b/tests/regression/apparmor/pipe.c similarity index 100% rename from tests/regression/subdomain/pipe.c rename to tests/regression/apparmor/pipe.c diff --git a/tests/regression/subdomain/pipe.sh b/tests/regression/apparmor/pipe.sh similarity index 100% rename from tests/regression/subdomain/pipe.sh rename to tests/regression/apparmor/pipe.sh diff --git a/tests/regression/subdomain/prologue.inc b/tests/regression/apparmor/prologue.inc similarity index 100% rename from tests/regression/subdomain/prologue.inc rename to tests/regression/apparmor/prologue.inc diff --git a/tests/regression/subdomain/ptrace.c b/tests/regression/apparmor/ptrace.c similarity index 100% rename from tests/regression/subdomain/ptrace.c rename to tests/regression/apparmor/ptrace.c diff --git a/tests/regression/subdomain/ptrace.sh b/tests/regression/apparmor/ptrace.sh similarity index 100% rename from tests/regression/subdomain/ptrace.sh rename to tests/regression/apparmor/ptrace.sh diff --git a/tests/regression/subdomain/ptrace_helper.c b/tests/regression/apparmor/ptrace_helper.c similarity index 100% rename from tests/regression/subdomain/ptrace_helper.c rename to tests/regression/apparmor/ptrace_helper.c diff --git a/tests/regression/subdomain/pwrite.c b/tests/regression/apparmor/pwrite.c similarity index 100% rename from tests/regression/subdomain/pwrite.c rename to tests/regression/apparmor/pwrite.c diff --git a/tests/regression/subdomain/pwrite.sh b/tests/regression/apparmor/pwrite.sh similarity index 100% rename from tests/regression/subdomain/pwrite.sh rename to tests/regression/apparmor/pwrite.sh diff --git a/tests/regression/subdomain/readdir.c b/tests/regression/apparmor/readdir.c similarity index 100% rename from tests/regression/subdomain/readdir.c rename to tests/regression/apparmor/readdir.c diff --git a/tests/regression/subdomain/readdir.sh b/tests/regression/apparmor/readdir.sh similarity index 100% rename from tests/regression/subdomain/readdir.sh rename to tests/regression/apparmor/readdir.sh diff --git a/tests/regression/subdomain/regex.sh b/tests/regression/apparmor/regex.sh similarity index 100% rename from tests/regression/subdomain/regex.sh rename to tests/regression/apparmor/regex.sh diff --git a/tests/regression/subdomain/rename.c b/tests/regression/apparmor/rename.c similarity index 100% rename from tests/regression/subdomain/rename.c rename to tests/regression/apparmor/rename.c diff --git a/tests/regression/subdomain/rename.sh b/tests/regression/apparmor/rename.sh similarity index 100% rename from tests/regression/subdomain/rename.sh rename to tests/regression/apparmor/rename.sh diff --git a/tests/regression/subdomain/rw.c b/tests/regression/apparmor/rw.c similarity index 100% rename from tests/regression/subdomain/rw.c rename to tests/regression/apparmor/rw.c diff --git a/tests/regression/subdomain/rw.sh b/tests/regression/apparmor/rw.sh similarity index 100% rename from tests/regression/subdomain/rw.sh rename to tests/regression/apparmor/rw.sh diff --git a/tests/regression/subdomain/scripts/make_tar.sh b/tests/regression/apparmor/scripts/make_tar.sh similarity index 100% rename from tests/regression/subdomain/scripts/make_tar.sh rename to tests/regression/apparmor/scripts/make_tar.sh diff --git a/tests/regression/subdomain/scripts/pull_metadata.pl b/tests/regression/apparmor/scripts/pull_metadata.pl similarity index 100% rename from tests/regression/subdomain/scripts/pull_metadata.pl rename to tests/regression/apparmor/scripts/pull_metadata.pl diff --git a/tests/regression/subdomain/sd_flags.sh b/tests/regression/apparmor/sd_flags.sh similarity index 100% rename from tests/regression/subdomain/sd_flags.sh rename to tests/regression/apparmor/sd_flags.sh diff --git a/tests/regression/subdomain/setattr.sh b/tests/regression/apparmor/setattr.sh similarity index 100% rename from tests/regression/subdomain/setattr.sh rename to tests/regression/apparmor/setattr.sh diff --git a/tests/regression/subdomain/strace.sh b/tests/regression/apparmor/strace.sh similarity index 100% rename from tests/regression/subdomain/strace.sh rename to tests/regression/apparmor/strace.sh diff --git a/tests/regression/subdomain/swap.c b/tests/regression/apparmor/swap.c similarity index 100% rename from tests/regression/subdomain/swap.c rename to tests/regression/apparmor/swap.c diff --git a/tests/regression/subdomain/swap.sh b/tests/regression/apparmor/swap.sh similarity index 100% rename from tests/regression/subdomain/swap.sh rename to tests/regression/apparmor/swap.sh diff --git a/tests/regression/subdomain/symlink.c b/tests/regression/apparmor/symlink.c similarity index 100% rename from tests/regression/subdomain/symlink.c rename to tests/regression/apparmor/symlink.c diff --git a/tests/regression/subdomain/symlink.sh b/tests/regression/apparmor/symlink.sh similarity index 100% rename from tests/regression/subdomain/symlink.sh rename to tests/regression/apparmor/symlink.sh diff --git a/tests/regression/subdomain/syscall.sh b/tests/regression/apparmor/syscall.sh similarity index 100% rename from tests/regression/subdomain/syscall.sh rename to tests/regression/apparmor/syscall.sh diff --git a/tests/regression/subdomain/syscall_chroot.c b/tests/regression/apparmor/syscall_chroot.c similarity index 100% rename from tests/regression/subdomain/syscall_chroot.c rename to tests/regression/apparmor/syscall_chroot.c diff --git a/tests/regression/subdomain/syscall_ioperm.c b/tests/regression/apparmor/syscall_ioperm.c similarity index 100% rename from tests/regression/subdomain/syscall_ioperm.c rename to tests/regression/apparmor/syscall_ioperm.c diff --git a/tests/regression/subdomain/syscall_iopl.c b/tests/regression/apparmor/syscall_iopl.c similarity index 100% rename from tests/regression/subdomain/syscall_iopl.c rename to tests/regression/apparmor/syscall_iopl.c diff --git a/tests/regression/subdomain/syscall_mknod.c b/tests/regression/apparmor/syscall_mknod.c similarity index 100% rename from tests/regression/subdomain/syscall_mknod.c rename to tests/regression/apparmor/syscall_mknod.c diff --git a/tests/regression/subdomain/syscall_mlockall.c b/tests/regression/apparmor/syscall_mlockall.c similarity index 100% rename from tests/regression/subdomain/syscall_mlockall.c rename to tests/regression/apparmor/syscall_mlockall.c diff --git a/tests/regression/subdomain/syscall_ptrace.c b/tests/regression/apparmor/syscall_ptrace.c similarity index 100% rename from tests/regression/subdomain/syscall_ptrace.c rename to tests/regression/apparmor/syscall_ptrace.c diff --git a/tests/regression/subdomain/syscall_query_module.c b/tests/regression/apparmor/syscall_query_module.c similarity index 100% rename from tests/regression/subdomain/syscall_query_module.c rename to tests/regression/apparmor/syscall_query_module.c diff --git a/tests/regression/subdomain/syscall_reboot.c b/tests/regression/apparmor/syscall_reboot.c similarity index 100% rename from tests/regression/subdomain/syscall_reboot.c rename to tests/regression/apparmor/syscall_reboot.c diff --git a/tests/regression/subdomain/syscall_setdomainname.c b/tests/regression/apparmor/syscall_setdomainname.c similarity index 100% rename from tests/regression/subdomain/syscall_setdomainname.c rename to tests/regression/apparmor/syscall_setdomainname.c diff --git a/tests/regression/subdomain/syscall_sethostname.c b/tests/regression/apparmor/syscall_sethostname.c similarity index 100% rename from tests/regression/subdomain/syscall_sethostname.c rename to tests/regression/apparmor/syscall_sethostname.c diff --git a/tests/regression/subdomain/syscall_setpriority.c b/tests/regression/apparmor/syscall_setpriority.c similarity index 100% rename from tests/regression/subdomain/syscall_setpriority.c rename to tests/regression/apparmor/syscall_setpriority.c diff --git a/tests/regression/subdomain/syscall_setscheduler.c b/tests/regression/apparmor/syscall_setscheduler.c similarity index 100% rename from tests/regression/subdomain/syscall_setscheduler.c rename to tests/regression/apparmor/syscall_setscheduler.c diff --git a/tests/regression/subdomain/syscall_sysctl.c b/tests/regression/apparmor/syscall_sysctl.c similarity index 100% rename from tests/regression/subdomain/syscall_sysctl.c rename to tests/regression/apparmor/syscall_sysctl.c diff --git a/tests/regression/subdomain/syscall_sysctl.sh b/tests/regression/apparmor/syscall_sysctl.sh similarity index 100% rename from tests/regression/subdomain/syscall_sysctl.sh rename to tests/regression/apparmor/syscall_sysctl.sh diff --git a/tests/regression/subdomain/sysctl_proc.c b/tests/regression/apparmor/sysctl_proc.c similarity index 100% rename from tests/regression/subdomain/sysctl_proc.c rename to tests/regression/apparmor/sysctl_proc.c diff --git a/tests/regression/subdomain/tcp.c b/tests/regression/apparmor/tcp.c similarity index 100% rename from tests/regression/subdomain/tcp.c rename to tests/regression/apparmor/tcp.c diff --git a/tests/regression/subdomain/tcp.sh b/tests/regression/apparmor/tcp.sh similarity index 100% rename from tests/regression/subdomain/tcp.sh rename to tests/regression/apparmor/tcp.sh diff --git a/tests/regression/subdomain/unix_fd_client.c b/tests/regression/apparmor/unix_fd_client.c similarity index 100% rename from tests/regression/subdomain/unix_fd_client.c rename to tests/regression/apparmor/unix_fd_client.c diff --git a/tests/regression/subdomain/unix_fd_server.c b/tests/regression/apparmor/unix_fd_server.c similarity index 100% rename from tests/regression/subdomain/unix_fd_server.c rename to tests/regression/apparmor/unix_fd_server.c diff --git a/tests/regression/subdomain/unix_fd_server.sh b/tests/regression/apparmor/unix_fd_server.sh similarity index 100% rename from tests/regression/subdomain/unix_fd_server.sh rename to tests/regression/apparmor/unix_fd_server.sh diff --git a/tests/regression/subdomain/unlink.c b/tests/regression/apparmor/unlink.c similarity index 100% rename from tests/regression/subdomain/unlink.c rename to tests/regression/apparmor/unlink.c diff --git a/tests/regression/subdomain/unlink.sh b/tests/regression/apparmor/unlink.sh similarity index 100% rename from tests/regression/subdomain/unlink.sh rename to tests/regression/apparmor/unlink.sh diff --git a/tests/regression/subdomain/uservars.inc b/tests/regression/apparmor/uservars.inc similarity index 100% rename from tests/regression/subdomain/uservars.inc rename to tests/regression/apparmor/uservars.inc diff --git a/tests/regression/subdomain/xattrs.c b/tests/regression/apparmor/xattrs.c similarity index 100% rename from tests/regression/subdomain/xattrs.c rename to tests/regression/apparmor/xattrs.c diff --git a/tests/regression/subdomain/xattrs.sh b/tests/regression/apparmor/xattrs.sh similarity index 100% rename from tests/regression/subdomain/xattrs.sh rename to tests/regression/apparmor/xattrs.sh