Merge branch 'zumbi:master' into 'master'

apparmor: support usrmerge in parser simpe_tests

See merge request apparmor/apparmor!33

Acked-by: Christian Boltz <apparmor@cboltz.de>

parser/tst/simple_tests/file/allow/ok_append_1.sd

@@ -4,11 +4,11 @@
 # vim:syntax=apparmor
 #
 /usr/bin/foo {
-  allow /bin/cat a,
-  allow /bin/true ra,
-  allow /bin/false ma,
+  allow /{usr/,}bin/cat a,
+  allow /{usr/,}bin/true ra,
+  allow /{usr/,}bin/false ma,
   allow /lib/libc.so la,
-  allow /bin/less ixa,
-  allow /bin/more pxa,
+  allow /{usr/,}bin/less ixa,
+  allow /{usr/,}bin/more pxa,
   allow /a uxa,
 }

parser/tst/simple_tests/file/allow/ok_embedded_spaces_1.sd

@@ -2,6 +2,6 @@
 #=EXRESULT PASS
 # vim:syntax=apparmor
 
-/bin/foo {
+/{usr/,}bin/foo {
   allow "/abc\ def" r,
 }

parser/tst/simple_tests/file/allow/ok_embedded_spaces_2.sd

@@ -2,6 +2,6 @@
 #=EXRESULT PASS
 # vim:syntax=apparmor
 
-/bin/foo {
+/{usr/,}bin/foo {
   allow "/abc def" r,
 }

parser/tst/simple_tests/file/allow/ok_lock_1.sd

@@ -4,15 +4,15 @@
 # vim:syntax=apparmor
 #
 /usr/bin/foo {
-  allow /bin/a k,
-  allow /bin/b rk,
-  allow /bin/c wk,
-  allow /bin/d ak,
-  allow /bin/e lk,
-  allow /bin/e mk,
-  allow /bin/f pxk,
-  allow /bin/g Pxk,
-  allow /bin/h ixk,
-  allow /bin/i uxk,
-  allow /bin/j Uxk,
+  allow /{usr/,}bin/a k,
+  allow /{usr/,}bin/b rk,
+  allow /{usr/,}bin/c wk,
+  allow /{usr/,}bin/d ak,
+  allow /{usr/,}bin/e lk,
+  allow /{usr/,}bin/e mk,
+  allow /{usr/,}bin/f pxk,
+  allow /{usr/,}bin/g Pxk,
+  allow /{usr/,}bin/h ixk,
+  allow /{usr/,}bin/i uxk,
+  allow /{usr/,}bin/j Uxk,
 }

parser/tst/simple_tests/file/allow/ok_mmap_1.sd

@@ -4,10 +4,10 @@
 # vim:syntax=apparmor
 #
 /usr/bin/foo {
-  allow /bin/cat mix,
-  allow /bin/true mpx,
-  allow /bin/false mux,
+  allow /{usr/,}bin/cat mix,
+  allow /{usr/,}bin/true mpx,
+  allow /{usr/,}bin/false mux,
   allow /lib/libc.so rwlm,
-  allow /bin/less mUx,
-  allow /bin/more mPx,
+  allow /{usr/,}bin/less mUx,
+  allow /{usr/,}bin/more mPx,
 }

parser/tst/simple_tests/file/allow/ok_mmap_2.sd

@@ -4,12 +4,12 @@
 # vim:syntax=apparmor
 #
 /usr/bin/foo {
-  allow /bin/cat rm,
-  allow /bin/cat ix,
-  allow /bin/true px,
-  allow /bin/true m,
-  allow /bin/false m,
-  allow /bin/false ux,
+  allow /{usr/,}bin/cat rm,
+  allow /{usr/,}bin/cat ix,
+  allow /{usr/,}bin/true px,
+  allow /{usr/,}bin/true m,
+  allow /{usr/,}bin/false m,
+  allow /{usr/,}bin/false ux,
   allow /lib/libc.so rwl,
   allow /lib/libc.so m,
 }