[apparmor] [PATCH 02/11] Fix xtrans tests

John Johansen john.johansen at canonical.com
Tue Dec 14 08:58:39 GMT 2010


Several of the x-trans tests where failing because of the include file was
bad.  This kept the test from testing what it was supposed as the test
was expected to fail.  Thus hidding a bug :(

Signed-off-by: John Johansen <john.johansen at canonical.com>
---
 parser/tst/simple_tests/xtrans/simple_bad_34.sd    |    2 +-
 .../simple_tests/xtrans/simple_bad_no_bare_x.sd    |    2 +-
 .../tst/simple_tests/xtrans/simple_bad_x_mods_1.sd |    2 +-
 .../simple_tests/xtrans/simple_bad_x_mods_10.sd    |    2 +-
 .../simple_tests/xtrans/simple_bad_x_mods_11.sd    |    9 -----
 .../simple_tests/xtrans/simple_bad_x_mods_12.sd    |    9 -----
 .../simple_tests/xtrans/simple_bad_x_mods_13.sd    |    9 -----
 .../simple_tests/xtrans/simple_bad_x_mods_14.sd    |    9 -----
 .../simple_tests/xtrans/simple_bad_x_mods_15.sd    |    2 +-
 .../simple_tests/xtrans/simple_bad_x_mods_16.sd    |    2 +-
 .../simple_tests/xtrans/simple_bad_x_mods_17.sd    |    2 +-
 .../simple_tests/xtrans/simple_bad_x_mods_18.sd    |    2 +-
 .../simple_tests/xtrans/simple_bad_x_mods_19.sd    |    2 +-
 .../tst/simple_tests/xtrans/simple_bad_x_mods_2.sd |    2 +-
 .../simple_tests/xtrans/simple_bad_x_mods_20.sd    |    2 +-
 .../simple_tests/xtrans/simple_bad_x_mods_21.sd    |    2 +-
 .../simple_tests/xtrans/simple_bad_x_mods_22.sd    |    2 +-
 .../simple_tests/xtrans/simple_bad_x_mods_23.sd    |    2 +-
 .../simple_tests/xtrans/simple_bad_x_mods_24.sd    |    2 +-
 .../simple_tests/xtrans/simple_bad_x_mods_25.sd    |    2 +-
 .../simple_tests/xtrans/simple_bad_x_mods_26.sd    |    2 +-
 .../simple_tests/xtrans/simple_bad_x_mods_27.sd    |    2 +-
 .../simple_tests/xtrans/simple_bad_x_mods_28.sd    |    2 +-
 .../simple_tests/xtrans/simple_bad_x_mods_29.sd    |    2 +-
 .../tst/simple_tests/xtrans/simple_bad_x_mods_3.sd |    2 +-
 .../simple_tests/xtrans/simple_bad_x_mods_30.sd    |    2 +-
 .../simple_tests/xtrans/simple_bad_x_mods_31.sd    |    2 +-
 .../simple_tests/xtrans/simple_bad_x_mods_32.sd    |    2 +-
 .../simple_tests/xtrans/simple_bad_x_mods_33.sd    |    2 +-
 .../tst/simple_tests/xtrans/simple_bad_x_mods_4.sd |    2 +-
 .../tst/simple_tests/xtrans/simple_bad_x_mods_5.sd |    2 +-
 .../tst/simple_tests/xtrans/simple_bad_x_mods_6.sd |    2 +-
 .../tst/simple_tests/xtrans/simple_bad_x_mods_7.sd |    2 +-
 .../tst/simple_tests/xtrans/simple_bad_x_mods_8.sd |    2 +-
 .../tst/simple_tests/xtrans/simple_bad_x_mods_9.sd |    2 +-
 .../xtrans/simple_bad_x_mods_first_1.sd            |    2 +-
 .../xtrans/simple_bad_x_mods_first_10.sd           |    2 +-
 .../xtrans/simple_bad_x_mods_first_11.sd           |    9 -----
 .../xtrans/simple_bad_x_mods_first_12.sd           |    9 -----
 .../xtrans/simple_bad_x_mods_first_13.sd           |    9 -----
 .../xtrans/simple_bad_x_mods_first_14.sd           |    9 -----
 .../xtrans/simple_bad_x_mods_first_15.sd           |    2 +-
 .../xtrans/simple_bad_x_mods_first_16.sd           |    2 +-
 .../xtrans/simple_bad_x_mods_first_17.sd           |    2 +-
 .../xtrans/simple_bad_x_mods_first_18.sd           |    2 +-
 .../xtrans/simple_bad_x_mods_first_19.sd           |    2 +-
 .../xtrans/simple_bad_x_mods_first_2.sd            |    2 +-
 .../xtrans/simple_bad_x_mods_first_20.sd           |    2 +-
 .../xtrans/simple_bad_x_mods_first_21.sd           |    2 +-
 .../xtrans/simple_bad_x_mods_first_22.sd           |    2 +-
 .../xtrans/simple_bad_x_mods_first_23.sd           |    2 +-
 .../xtrans/simple_bad_x_mods_first_24.sd           |    2 +-
 .../xtrans/simple_bad_x_mods_first_25.sd           |    2 +-
 .../xtrans/simple_bad_x_mods_first_26.sd           |    2 +-
 .../xtrans/simple_bad_x_mods_first_27.sd           |    2 +-
 .../xtrans/simple_bad_x_mods_first_28.sd           |    2 +-
 .../xtrans/simple_bad_x_mods_first_29.sd           |    2 +-
 .../xtrans/simple_bad_x_mods_first_3.sd            |    2 +-
 .../xtrans/simple_bad_x_mods_first_30.sd           |    2 +-
 .../xtrans/simple_bad_x_mods_first_31.sd           |    2 +-
 .../xtrans/simple_bad_x_mods_first_32.sd           |    2 +-
 .../xtrans/simple_bad_x_mods_first_33.sd           |    2 +-
 .../xtrans/simple_bad_x_mods_first_4.sd            |    2 +-
 .../xtrans/simple_bad_x_mods_first_5.sd            |    2 +-
 .../xtrans/simple_bad_x_mods_first_6.sd            |    2 +-
 .../xtrans/simple_bad_x_mods_first_7.sd            |    2 +-
 .../xtrans/simple_bad_x_mods_first_8.sd            |    2 +-
 .../xtrans/simple_bad_x_mods_first_9.sd            |    2 +-
 parser/tst/simple_tests/xtrans/simple_ok_pux_1.sd  |   35 ++++++++++++++++++++
 69 files changed, 95 insertions(+), 132 deletions(-)
 delete mode 100644 parser/tst/simple_tests/xtrans/simple_bad_x_mods_11.sd
 delete mode 100644 parser/tst/simple_tests/xtrans/simple_bad_x_mods_12.sd
 delete mode 100644 parser/tst/simple_tests/xtrans/simple_bad_x_mods_13.sd
 delete mode 100644 parser/tst/simple_tests/xtrans/simple_bad_x_mods_14.sd
 delete mode 100644 parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_11.sd
 delete mode 100644 parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_12.sd
 delete mode 100644 parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_13.sd
 delete mode 100644 parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_14.sd
 create mode 100644 parser/tst/simple_tests/xtrans/simple_ok_pux_1.sd

diff --git a/parser/tst/simple_tests/xtrans/simple_bad_34.sd b/parser/tst/simple_tests/xtrans/simple_bad_34.sd
index 4f8782e..3124880 100644
--- a/parser/tst/simple_tests/xtrans/simple_bad_34.sd
+++ b/parser/tst/simple_tests/xtrans/simple_bad_34.sd
@@ -3,7 +3,7 @@
 #=EXRESULT FAIL
 #
 /usr/bin/foo {
-  #include <includes/files>
+
   /bin/ls rIUx,
 }
 
diff --git a/parser/tst/simple_tests/xtrans/simple_bad_no_bare_x.sd b/parser/tst/simple_tests/xtrans/simple_bad_no_bare_x.sd
index 96755d6..b086ba3 100644
--- a/parser/tst/simple_tests/xtrans/simple_bad_no_bare_x.sd
+++ b/parser/tst/simple_tests/xtrans/simple_bad_no_bare_x.sd
@@ -3,7 +3,7 @@
 #=EXRESULT FAIL
 #
 /usr/bin/foo {
-  #include <includes/files>
+
   /bin/ls rx,
 }
 
diff --git a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_1.sd b/parser/tst/simple_tests/xtrans/simple_bad_x_mods_1.sd
index 8aa9c30..42780e7 100644
--- a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_1.sd
+++ b/parser/tst/simple_tests/xtrans/simple_bad_x_mods_1.sd
@@ -3,7 +3,7 @@
 #=EXRESULT FAIL
 #
 /usr/bin/foo {
-  #include <includes/files>
+
   /bin/ls rp,
 }
 
diff --git a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_10.sd b/parser/tst/simple_tests/xtrans/simple_bad_x_mods_10.sd
index d44edc5..7ea4f0f 100644
--- a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_10.sd
+++ b/parser/tst/simple_tests/xtrans/simple_bad_x_mods_10.sd
@@ -3,7 +3,7 @@
 #=EXRESULT FAIL
 #
 /usr/bin/foo {
-  #include <includes/files>
+
   /bin/ls Urx,
 }
 
diff --git a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_11.sd b/parser/tst/simple_tests/xtrans/simple_bad_x_mods_11.sd
deleted file mode 100644
index e0c1a4a..0000000
--- a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_11.sd
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-#=DESCRIPTION only pix is allowed as a multiple x modifier
-#=EXRESULT FAIL
-#
-/usr/bin/foo {
-  #include <includes/files>
-  /bin/ls rpux,
-}
-
diff --git a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_12.sd b/parser/tst/simple_tests/xtrans/simple_bad_x_mods_12.sd
deleted file mode 100644
index a63d102..0000000
--- a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_12.sd
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-#=DESCRIPTION only pix is allowed as a multiple x modifier
-#=EXRESULT FAIL
-#
-/usr/bin/foo {
-  #include <includes/files>
-  /bin/ls rPux,
-}
-
diff --git a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_13.sd b/parser/tst/simple_tests/xtrans/simple_bad_x_mods_13.sd
deleted file mode 100644
index 12fe646..0000000
--- a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_13.sd
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-#=DESCRIPTION only pix is allowed as a multiple x modifier
-#=EXRESULT FAIL
-#
-/usr/bin/foo {
-  #include <includes/files>
-  /bin/ls rpUx,
-}
-
diff --git a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_14.sd b/parser/tst/simple_tests/xtrans/simple_bad_x_mods_14.sd
deleted file mode 100644
index 5736429..0000000
--- a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_14.sd
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-#=DESCRIPTION only pix is allowed as a multiple x modifier
-#=EXRESULT FAIL
-#
-/usr/bin/foo {
-  #include <includes/files>
-  /bin/ls rPUx,
-}
-
diff --git a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_15.sd b/parser/tst/simple_tests/xtrans/simple_bad_x_mods_15.sd
index 34a4316..31b6cbe 100644
--- a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_15.sd
+++ b/parser/tst/simple_tests/xtrans/simple_bad_x_mods_15.sd
@@ -3,7 +3,7 @@
 #=EXRESULT FAIL
 #
 /usr/bin/foo {
-  #include <includes/files>
+
   /bin/ls rppx,
 }
 
diff --git a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_16.sd b/parser/tst/simple_tests/xtrans/simple_bad_x_mods_16.sd
index 7734b25..9ecb301 100644
--- a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_16.sd
+++ b/parser/tst/simple_tests/xtrans/simple_bad_x_mods_16.sd
@@ -3,7 +3,7 @@
 #=EXRESULT FAIL
 #
 /usr/bin/foo {
-  #include <includes/files>
+
   /bin/ls rpPx,
 }
 
diff --git a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_17.sd b/parser/tst/simple_tests/xtrans/simple_bad_x_mods_17.sd
index f3a6711..4ac5a09 100644
--- a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_17.sd
+++ b/parser/tst/simple_tests/xtrans/simple_bad_x_mods_17.sd
@@ -3,7 +3,7 @@
 #=EXRESULT FAIL
 #
 /usr/bin/foo {
-  #include <includes/files>
+
   /bin/ls rPpx,
 }
 
diff --git a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_18.sd b/parser/tst/simple_tests/xtrans/simple_bad_x_mods_18.sd
index 209dc2c..7b1bbf7 100644
--- a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_18.sd
+++ b/parser/tst/simple_tests/xtrans/simple_bad_x_mods_18.sd
@@ -3,7 +3,7 @@
 #=EXRESULT FAIL
 #
 /usr/bin/foo {
-  #include <includes/files>
+
   /bin/ls rPPx,
 }
 
diff --git a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_19.sd b/parser/tst/simple_tests/xtrans/simple_bad_x_mods_19.sd
index ee99f4d..3906b3f 100644
--- a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_19.sd
+++ b/parser/tst/simple_tests/xtrans/simple_bad_x_mods_19.sd
@@ -3,7 +3,7 @@
 #=EXRESULT FAIL
 #
 /usr/bin/foo {
-  #include <includes/files>
+
   /bin/ls ripx,
 }
 
diff --git a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_2.sd b/parser/tst/simple_tests/xtrans/simple_bad_x_mods_2.sd
index 1a9d61d..3668f3a 100644
--- a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_2.sd
+++ b/parser/tst/simple_tests/xtrans/simple_bad_x_mods_2.sd
@@ -3,7 +3,7 @@
 #=EXRESULT FAIL
 #
 /usr/bin/foo {
-  #include <includes/files>
+
   /bin/ls rP,
 }
 
diff --git a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_20.sd b/parser/tst/simple_tests/xtrans/simple_bad_x_mods_20.sd
index 0dbbebf..db78448 100644
--- a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_20.sd
+++ b/parser/tst/simple_tests/xtrans/simple_bad_x_mods_20.sd
@@ -3,7 +3,7 @@
 #=EXRESULT FAIL
 #
 /usr/bin/foo {
-  #include <includes/files>
+
   /bin/ls riPx,
 }
 
diff --git a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_21.sd b/parser/tst/simple_tests/xtrans/simple_bad_x_mods_21.sd
index 42dc385..9aa3156 100644
--- a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_21.sd
+++ b/parser/tst/simple_tests/xtrans/simple_bad_x_mods_21.sd
@@ -3,7 +3,7 @@
 #=EXRESULT FAIL
 #
 /usr/bin/foo {
-  #include <includes/files>
+
   /bin/ls rIpx,
 }
 
diff --git a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_22.sd b/parser/tst/simple_tests/xtrans/simple_bad_x_mods_22.sd
index 607cf30..eeb9f57 100644
--- a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_22.sd
+++ b/parser/tst/simple_tests/xtrans/simple_bad_x_mods_22.sd
@@ -3,7 +3,7 @@
 #=EXRESULT FAIL
 #
 /usr/bin/foo {
-  #include <includes/files>
+
   /bin/ls rIPx,
 }
 
diff --git a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_23.sd b/parser/tst/simple_tests/xtrans/simple_bad_x_mods_23.sd
index 9dfeb3a..7461fbd 100644
--- a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_23.sd
+++ b/parser/tst/simple_tests/xtrans/simple_bad_x_mods_23.sd
@@ -3,7 +3,7 @@
 #=EXRESULT FAIL
 #
 /usr/bin/foo {
-  #include <includes/files>
+
   /bin/ls rupx,
 }
 
diff --git a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_24.sd b/parser/tst/simple_tests/xtrans/simple_bad_x_mods_24.sd
index d8a17cf..ff982a7 100644
--- a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_24.sd
+++ b/parser/tst/simple_tests/xtrans/simple_bad_x_mods_24.sd
@@ -3,7 +3,7 @@
 #=EXRESULT FAIL
 #
 /usr/bin/foo {
-  #include <includes/files>
+
   /bin/ls ruPx,
 }
 
diff --git a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_25.sd b/parser/tst/simple_tests/xtrans/simple_bad_x_mods_25.sd
index 4a9aa72..8ff831d 100644
--- a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_25.sd
+++ b/parser/tst/simple_tests/xtrans/simple_bad_x_mods_25.sd
@@ -3,7 +3,7 @@
 #=EXRESULT FAIL
 #
 /usr/bin/foo {
-  #include <includes/files>
+
   /bin/ls rUpx,
 }
 
diff --git a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_26.sd b/parser/tst/simple_tests/xtrans/simple_bad_x_mods_26.sd
index 5ee17c1..17d7821 100644
--- a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_26.sd
+++ b/parser/tst/simple_tests/xtrans/simple_bad_x_mods_26.sd
@@ -3,7 +3,7 @@
 #=EXRESULT FAIL
 #
 /usr/bin/foo {
-  #include <includes/files>
+
   /bin/ls rUPx,
 }
 
diff --git a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_27.sd b/parser/tst/simple_tests/xtrans/simple_bad_x_mods_27.sd
index b03d9fe..af01f71 100644
--- a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_27.sd
+++ b/parser/tst/simple_tests/xtrans/simple_bad_x_mods_27.sd
@@ -3,7 +3,7 @@
 #=EXRESULT FAIL
 #
 /usr/bin/foo {
-  #include <includes/files>
+
   /bin/ls ruix,
 }
 
diff --git a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_28.sd b/parser/tst/simple_tests/xtrans/simple_bad_x_mods_28.sd
index 7b53634..cf2d91b 100644
--- a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_28.sd
+++ b/parser/tst/simple_tests/xtrans/simple_bad_x_mods_28.sd
@@ -3,7 +3,7 @@
 #=EXRESULT FAIL
 #
 /usr/bin/foo {
-  #include <includes/files>
+
   /bin/ls ruIx,
 }
 
diff --git a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_29.sd b/parser/tst/simple_tests/xtrans/simple_bad_x_mods_29.sd
index a579ebe..a5a5821 100644
--- a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_29.sd
+++ b/parser/tst/simple_tests/xtrans/simple_bad_x_mods_29.sd
@@ -3,7 +3,7 @@
 #=EXRESULT FAIL
 #
 /usr/bin/foo {
-  #include <includes/files>
+
   /bin/ls rUix,
 }
 
diff --git a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_3.sd b/parser/tst/simple_tests/xtrans/simple_bad_x_mods_3.sd
index 1dcdb22..db58813 100644
--- a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_3.sd
+++ b/parser/tst/simple_tests/xtrans/simple_bad_x_mods_3.sd
@@ -3,7 +3,7 @@
 #=EXRESULT FAIL
 #
 /usr/bin/foo {
-  #include <includes/files>
+
   /bin/ls ri,
 }
 
diff --git a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_30.sd b/parser/tst/simple_tests/xtrans/simple_bad_x_mods_30.sd
index 7c2c6b5..88dae65 100644
--- a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_30.sd
+++ b/parser/tst/simple_tests/xtrans/simple_bad_x_mods_30.sd
@@ -3,7 +3,7 @@
 #=EXRESULT FAIL
 #
 /usr/bin/foo {
-  #include <includes/files>
+
   /bin/ls rUIx,
 }
 
diff --git a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_31.sd b/parser/tst/simple_tests/xtrans/simple_bad_x_mods_31.sd
index 22f5e44..93471b9 100644
--- a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_31.sd
+++ b/parser/tst/simple_tests/xtrans/simple_bad_x_mods_31.sd
@@ -3,7 +3,7 @@
 #=EXRESULT FAIL
 #
 /usr/bin/foo {
-  #include <includes/files>
+
   /bin/ls riux,
 }
 
diff --git a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_32.sd b/parser/tst/simple_tests/xtrans/simple_bad_x_mods_32.sd
index 1cf1458..0e9c8ec 100644
--- a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_32.sd
+++ b/parser/tst/simple_tests/xtrans/simple_bad_x_mods_32.sd
@@ -3,7 +3,7 @@
 #=EXRESULT FAIL
 #
 /usr/bin/foo {
-  #include <includes/files>
+
   /bin/ls riUx,
 }
 
diff --git a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_33.sd b/parser/tst/simple_tests/xtrans/simple_bad_x_mods_33.sd
index 9f44320..5c782c1 100644
--- a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_33.sd
+++ b/parser/tst/simple_tests/xtrans/simple_bad_x_mods_33.sd
@@ -3,7 +3,7 @@
 #=EXRESULT FAIL
 #
 /usr/bin/foo {
-  #include <includes/files>
+
   /bin/ls rIux,
 }
 
diff --git a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_4.sd b/parser/tst/simple_tests/xtrans/simple_bad_x_mods_4.sd
index c4446b4..9cb1406 100644
--- a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_4.sd
+++ b/parser/tst/simple_tests/xtrans/simple_bad_x_mods_4.sd
@@ -3,7 +3,7 @@
 #=EXRESULT FAIL
 #
 /usr/bin/foo {
-  #include <includes/files>
+
   /bin/ls ru,
 }
 
diff --git a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_5.sd b/parser/tst/simple_tests/xtrans/simple_bad_x_mods_5.sd
index 535d7d7..e77e2ce 100644
--- a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_5.sd
+++ b/parser/tst/simple_tests/xtrans/simple_bad_x_mods_5.sd
@@ -3,7 +3,7 @@
 #=EXRESULT FAIL
 #
 /usr/bin/foo {
-  #include <includes/files>
+
   /bin/ls rU,
 }
 
diff --git a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_6.sd b/parser/tst/simple_tests/xtrans/simple_bad_x_mods_6.sd
index daa9080..caf20c7 100644
--- a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_6.sd
+++ b/parser/tst/simple_tests/xtrans/simple_bad_x_mods_6.sd
@@ -3,7 +3,7 @@
 #=EXRESULT FAIL
 #
 /usr/bin/foo {
-  #include <includes/files>
+
   /bin/ls prx,
 }
 
diff --git a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_7.sd b/parser/tst/simple_tests/xtrans/simple_bad_x_mods_7.sd
index e61728b..be2cf38 100644
--- a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_7.sd
+++ b/parser/tst/simple_tests/xtrans/simple_bad_x_mods_7.sd
@@ -3,7 +3,7 @@
 #=EXRESULT FAIL
 #
 /usr/bin/foo {
-  #include <includes/files>
+
   /bin/ls irx,
 }
 
diff --git a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_8.sd b/parser/tst/simple_tests/xtrans/simple_bad_x_mods_8.sd
index e61728b..be2cf38 100644
--- a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_8.sd
+++ b/parser/tst/simple_tests/xtrans/simple_bad_x_mods_8.sd
@@ -3,7 +3,7 @@
 #=EXRESULT FAIL
 #
 /usr/bin/foo {
-  #include <includes/files>
+
   /bin/ls irx,
 }
 
diff --git a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_9.sd b/parser/tst/simple_tests/xtrans/simple_bad_x_mods_9.sd
index a65ff60..a66da01 100644
--- a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_9.sd
+++ b/parser/tst/simple_tests/xtrans/simple_bad_x_mods_9.sd
@@ -3,7 +3,7 @@
 #=EXRESULT FAIL
 #
 /usr/bin/foo {
-  #include <includes/files>
+
   /bin/ls urx,
 }
 
diff --git a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_1.sd b/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_1.sd
index c85a907..2124c39 100644
--- a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_1.sd
+++ b/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_1.sd
@@ -3,7 +3,7 @@
 #=EXRESULT FAIL
 #
 /usr/bin/foo {
-  #include <includes/files>
+
   rp /bin/ls,
 }
 
diff --git a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_10.sd b/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_10.sd
index 9502ff8..d78ea70 100644
--- a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_10.sd
+++ b/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_10.sd
@@ -3,7 +3,7 @@
 #=EXRESULT FAIL
 #
 /usr/bin/foo {
-  #include <includes/files>
+
   Urx /bin/ls,
 }
 
diff --git a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_11.sd b/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_11.sd
deleted file mode 100644
index 74b0c3f..0000000
--- a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_11.sd
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-#=DESCRIPTION only pix is allowed as a multiple x modifier
-#=EXRESULT FAIL
-#
-/usr/bin/foo {
-  #include <includes/files>
-  rpux /bin/ls,
-}
-
diff --git a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_12.sd b/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_12.sd
deleted file mode 100644
index b8085ac..0000000
--- a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_12.sd
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-#=DESCRIPTION only pix is allowed as a multiple x modifier
-#=EXRESULT FAIL
-#
-/usr/bin/foo {
-  #include <includes/files>
-  rPux /bin/ls,
-}
-
diff --git a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_13.sd b/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_13.sd
deleted file mode 100644
index 372d09c..0000000
--- a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_13.sd
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-#=DESCRIPTION only pix is allowed as a multiple x modifier
-#=EXRESULT FAIL
-#
-/usr/bin/foo {
-  #include <includes/files>
-  rpUx /bin/ls,
-}
-
diff --git a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_14.sd b/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_14.sd
deleted file mode 100644
index 2d4f695..0000000
--- a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_14.sd
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-#=DESCRIPTION only pix is allowed as a multiple x modifier
-#=EXRESULT FAIL
-#
-/usr/bin/foo {
-  #include <includes/files>
-  RpuX /bin/ls,
-}
-
diff --git a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_15.sd b/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_15.sd
index 327387e..776c1c4 100644
--- a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_15.sd
+++ b/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_15.sd
@@ -3,7 +3,7 @@
 #=EXRESULT FAIL
 #
 /usr/bin/foo {
-  #include <includes/files>
+
   rppx /bin/ls,
 }
 
diff --git a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_16.sd b/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_16.sd
index fbb6575..a19e5db 100644
--- a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_16.sd
+++ b/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_16.sd
@@ -3,7 +3,7 @@
 #=EXRESULT FAIL
 #
 /usr/bin/foo {
-  #include <includes/files>
+
   rpPx /bin/ls,
 }
 
diff --git a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_17.sd b/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_17.sd
index ccb52e4..4569a2e 100644
--- a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_17.sd
+++ b/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_17.sd
@@ -3,7 +3,7 @@
 #=EXRESULT FAIL
 #
 /usr/bin/foo {
-  #include <includes/files>
+
   rPpx /bin/ls,
 }
 
diff --git a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_18.sd b/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_18.sd
index 7708313..74d8e66 100644
--- a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_18.sd
+++ b/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_18.sd
@@ -3,7 +3,7 @@
 #=EXRESULT FAIL
 #
 /usr/bin/foo {
-  #include <includes/files>
+
   rPPx /bin/ls,
 }
 
diff --git a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_19.sd b/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_19.sd
index 31828b7..75b0513 100644
--- a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_19.sd
+++ b/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_19.sd
@@ -3,7 +3,7 @@
 #=EXRESULT FAIL
 #
 /usr/bin/foo {
-  #include <includes/files>
+
   ripx /bin/ls,
 }
 
diff --git a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_2.sd b/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_2.sd
index a7fca86..48fee29 100644
--- a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_2.sd
+++ b/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_2.sd
@@ -3,7 +3,7 @@
 #=EXRESULT FAIL
 #
 /usr/bin/foo {
-  #include <includes/files>
+
   rP /bin/ls,
 }
 
diff --git a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_20.sd b/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_20.sd
index 8fdbd6f..c336e10 100644
--- a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_20.sd
+++ b/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_20.sd
@@ -3,7 +3,7 @@
 #=EXRESULT FAIL
 #
 /usr/bin/foo {
-  #include <includes/files>
+
   riPx /bin/ls,
 }
 
diff --git a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_21.sd b/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_21.sd
index a3cdd21..4804173 100644
--- a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_21.sd
+++ b/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_21.sd
@@ -3,7 +3,7 @@
 #=EXRESULT FAIL
 #
 /usr/bin/foo {
-  #include <includes/files>
+
   rIpx /bin/ls,
 }
 
diff --git a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_22.sd b/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_22.sd
index 9f2969c..8010485 100644
--- a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_22.sd
+++ b/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_22.sd
@@ -3,7 +3,7 @@
 #=EXRESULT FAIL
 #
 /usr/bin/foo {
-  #include <includes/files>
+
   rIPx /bin/ls,
 }
 
diff --git a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_23.sd b/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_23.sd
index 05f5e69..5990086 100644
--- a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_23.sd
+++ b/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_23.sd
@@ -3,7 +3,7 @@
 #=EXRESULT FAIL
 #
 /usr/bin/foo {
-  #include <includes/files>
+
   rupx /bin/ls,
 }
 
diff --git a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_24.sd b/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_24.sd
index f740376..d3a5298 100644
--- a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_24.sd
+++ b/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_24.sd
@@ -3,7 +3,7 @@
 #=EXRESULT FAIL
 #
 /usr/bin/foo {
-  #include <includes/files>
+
   ruPx /bin/ls,
 }
 
diff --git a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_25.sd b/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_25.sd
index 382a61a..b47060f 100644
--- a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_25.sd
+++ b/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_25.sd
@@ -3,7 +3,7 @@
 #=EXRESULT FAIL
 #
 /usr/bin/foo {
-  #include <includes/files>
+
   rUpx /bin/ls,
 }
 
diff --git a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_26.sd b/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_26.sd
index 0e1d170..a707243 100644
--- a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_26.sd
+++ b/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_26.sd
@@ -3,7 +3,7 @@
 #=EXRESULT FAIL
 #
 /usr/bin/foo {
-  #include <includes/files>
+
   rUPx /bin/ls,
 }
 
diff --git a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_27.sd b/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_27.sd
index 8d8b9ac..3a1523e 100644
--- a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_27.sd
+++ b/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_27.sd
@@ -3,7 +3,7 @@
 #=EXRESULT FAIL
 #
 /usr/bin/foo {
-  #include <includes/files>
+
   ruix /bin/ls,
 }
 
diff --git a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_28.sd b/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_28.sd
index 71a60a2..1b5558e 100644
--- a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_28.sd
+++ b/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_28.sd
@@ -3,7 +3,7 @@
 #=EXRESULT FAIL
 #
 /usr/bin/foo {
-  #include <includes/files>
+
   ruIx /bin/ls,
 }
 
diff --git a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_29.sd b/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_29.sd
index 9ccc34d..49094b8 100644
--- a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_29.sd
+++ b/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_29.sd
@@ -3,7 +3,7 @@
 #=EXRESULT FAIL
 #
 /usr/bin/foo {
-  #include <includes/files>
+
   rUix /bin/ls,
 }
 
diff --git a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_3.sd b/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_3.sd
index eda9e4a..ddedd66 100644
--- a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_3.sd
+++ b/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_3.sd
@@ -3,7 +3,7 @@
 #=EXRESULT FAIL
 #
 /usr/bin/foo {
-  #include <includes/files>
+
   ri /bin/ls,
 }
 
diff --git a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_30.sd b/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_30.sd
index b315ac5..335bc7f 100644
--- a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_30.sd
+++ b/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_30.sd
@@ -3,7 +3,7 @@
 #=EXRESULT FAIL
 #
 /usr/bin/foo {
-  #include <includes/files>
+
   rUIx /bin/ls,
 }
 
diff --git a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_31.sd b/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_31.sd
index 1abf076..5a9f346 100644
--- a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_31.sd
+++ b/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_31.sd
@@ -3,7 +3,7 @@
 #=EXRESULT FAIL
 #
 /usr/bin/foo {
-  #include <includes/files>
+
   riux /bin/ls,
 }
 
diff --git a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_32.sd b/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_32.sd
index 4c3aabb..a935d30 100644
--- a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_32.sd
+++ b/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_32.sd
@@ -3,7 +3,7 @@
 #=EXRESULT FAIL
 #
 /usr/bin/foo {
-  #include <includes/files>
+
   riUx /bin/ls,
 }
 
diff --git a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_33.sd b/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_33.sd
index b1340c7..6768e60 100644
--- a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_33.sd
+++ b/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_33.sd
@@ -3,7 +3,7 @@
 #=EXRESULT FAIL
 #
 /usr/bin/foo {
-  #include <includes/files>
+
   rIux /bin/ls,
 }
 
diff --git a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_4.sd b/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_4.sd
index f463e71..ca916af 100644
--- a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_4.sd
+++ b/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_4.sd
@@ -3,7 +3,7 @@
 #=EXRESULT FAIL
 #
 /usr/bin/foo {
-  #include <includes/files>
+
   ru /bin/ls,
 }
 
diff --git a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_5.sd b/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_5.sd
index 5f5bf4b..b68bef3 100644
--- a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_5.sd
+++ b/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_5.sd
@@ -3,7 +3,7 @@
 #=EXRESULT FAIL
 #
 /usr/bin/foo {
-  #include <includes/files>
+
   rU /bin/ls,
 }
 
diff --git a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_6.sd b/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_6.sd
index 36d473f..6b94b56 100644
--- a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_6.sd
+++ b/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_6.sd
@@ -3,7 +3,7 @@
 #=EXRESULT FAIL
 #
 /usr/bin/foo {
-  #include <includes/files>
+
   prx /bin/ls,
 }
 
diff --git a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_7.sd b/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_7.sd
index 3ffcf54..02936fd 100644
--- a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_7.sd
+++ b/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_7.sd
@@ -3,7 +3,7 @@
 #=EXRESULT FAIL
 #
 /usr/bin/foo {
-  #include <includes/files>
+
   irx /bin/ls,
 }
 
diff --git a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_8.sd b/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_8.sd
index 3ffcf54..02936fd 100644
--- a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_8.sd
+++ b/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_8.sd
@@ -3,7 +3,7 @@
 #=EXRESULT FAIL
 #
 /usr/bin/foo {
-  #include <includes/files>
+
   irx /bin/ls,
 }
 
diff --git a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_9.sd b/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_9.sd
index ba958e4..fa1425a 100644
--- a/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_9.sd
+++ b/parser/tst/simple_tests/xtrans/simple_bad_x_mods_first_9.sd
@@ -3,7 +3,7 @@
 #=EXRESULT FAIL
 #
 /usr/bin/foo {
-  #include <includes/files>
+
   urx /bin/ls,
 }
 
diff --git a/parser/tst/simple_tests/xtrans/simple_ok_pux_1.sd b/parser/tst/simple_tests/xtrans/simple_ok_pux_1.sd
new file mode 100644
index 0000000..0b80a84
--- /dev/null
+++ b/parser/tst/simple_tests/xtrans/simple_ok_pux_1.sd
@@ -0,0 +1,35 @@
+#
+#=DESCRIPTION pux is allowed as a multiple x modifier
+#=EXRESULT PASS
+#
+/usr/bin/foo {
+  /bin/ls rpux,
+}
+
+/usr/bin/foo2 {
+  /bin/ls rPux,
+}
+
+/usr/bin/foo3 {
+  /bin/ls rpUx,
+}
+
+/usr/bin/foo4 {
+  /bin/ls rPUx,
+}
+
+/usr/bin/foo5 {
+  rpux /bin/ls,
+}
+
+/usr/bin/foo6 {
+  rPux /bin/ls,
+}
+
+/usr/bin/foo7 {
+  rpUx /bin/ls,
+}
+
+/usr/bin/foo8 {
+  rPUx /bin/ls,
+}
-- 
1.7.1




More information about the AppArmor mailing list