Hello,
flags_bad5.sd contains tests to ensure the debug flag is no longer
accepted.
However, the file contains multiple expected failures, which means that
it will still as long as at least one of them fails. This patch splits
each test into its own file to ensure each of them fails.
[ parser-test-flags-split-bad5.diff ]
=== added file 'parser/tst/simple_tests/profile/flags/flags_bad18.sd'
--- parser/tst/simple_tests/profile/flags/flags_bad18.sd 1970-01-01
00:00:00 +0000
+++ parser/tst/simple_tests/profile/flags/flags_bad18.sd 2015-03-02
18:20:04 +0000
@@ -0,0 +1,11 @@
+#
+#=DESCRIPTION Ensure debug flag is no longer accepted
+#=EXRESULT FAIL
+# vim:syntax=subdomain
+# Last Modified: Sun Apr 17 19:44:44 2005
+#
+/does/not/exist2 (audit,debug) {
+ /usr/X11R6/lib/lib*so* r,
+ /does/not/exist2 r,
+}
+
=== added file 'parser/tst/simple_tests/profile/flags/flags_bad19.sd'
--- parser/tst/simple_tests/profile/flags/flags_bad19.sd 1970-01-01
00:00:00 +0000
+++ parser/tst/simple_tests/profile/flags/flags_bad19.sd 2015-03-02
18:20:34 +0000
@@ -0,0 +1,10 @@
+#
+#=DESCRIPTION Ensure debug flag is no longer accepted
+#=EXRESULT FAIL
+# vim:syntax=subdomain
+# Last Modified: Sun Apr 17 19:44:44 2005
+#
+/does/not/exist3 (debug,complain) {
+ /usr/X11R6/lib/lib*so* r,
+ /does/not/exist5 r,
+}
=== added file 'parser/tst/simple_tests/profile/flags/flags_bad20.sd'
--- parser/tst/simple_tests/profile/flags/flags_bad20.sd 1970-01-01
00:00:00 +0000
+++ parser/tst/simple_tests/profile/flags/flags_bad20.sd 2015-03-02
18:20:47 +0000
@@ -0,0 +1,14 @@
+#
+#=DESCRIPTION Ensure debug flag is no longer accepted (even if it's inside a
hat)
+#=EXRESULT FAIL
+# vim:syntax=subdomain
+# Last Modified: Sun Apr 17 19:44:44 2005
+#
+/does/not/exist4 (audit,complain) {
+ /usr/X11R6/lib/lib*so* r,
+ /does/not/exist7 r,
+
+ ^debug (debug) {
+ /var/log/debug rwl,
+ }
+}
=== modified file 'parser/tst/simple_tests/profile/flags/flags_bad5.sd'
--- parser/tst/simple_tests/profile/flags/flags_bad5.sd 2014-08-16 11:22:51
+0000
+++ parser/tst/simple_tests/profile/flags/flags_bad5.sd 2015-03-02 18:19:12
+0000
@@ -9,22 +9,3 @@
/does/not/exist r,
}
-/does/not/exist2 (audit,debug) {
- /usr/X11R6/lib/lib*so* r,
- /does/not/exist2 r,
-}
-
-/does/not/exist3 (debug,complain) {
- /usr/X11R6/lib/lib*so* r,
- /does/not/exist5 r,
-}
-
-/does/not/exist4 (audit,complain) {
- /usr/X11R6/lib/lib*so* r,
- /does/not/exist7 r,
-
- ^debug (debug) {
- /var/log/debug rwl,
- }
-}
-
Regards,
Christian Boltz
--
Working in a datacentre is the next best thing to being talented and
popular. I get to spend hours surrounded by thousands of screaming fans
[http://twitter.com/_gmh_/status/80741758358654977]
--
AppArmor mailing list
AppArmor@lists.ubuntu.com
Modify settings or unsubscribe at:
https://lists.ubuntu.com/mailman/listinfo/apparmor
