[apparmor] [patch] Add DESCRIPTION and EXRESULT to new simple_tests includes

Christian Boltz apparmor at cboltz.de
Sat Jul 11 15:54:53 UTC 2015


Hello,

some of the include files added to simple_tests recently don't live in
one of the main include directories (includes/, includes-preamble/ or
include_tests/) which lets test-parser-simple-tests.py fail because
those files don't contain EXRESULT.

Instead of adding more exceptions to test-parser-simple-tests.py, this
patch adds DESCRIPTION and EXRESULT to those include files.


[ simple_tests-add-exresult-to-includes.diff ]

=== modified file 'parser/tst/simple_tests/bare_include_tests/ignored_suffix/good-include'
--- parser/tst/simple_tests/bare_include_tests/ignored_suffix/good-include      2015-07-09 00:19:57 +0000
+++ parser/tst/simple_tests/bare_include_tests/ignored_suffix/good-include      2015-07-11 15:24:03 +0000
@@ -1,2 +1,6 @@
-# Valid include
+#=DESCRIPTION Valid include
+#
+# if parsed stand-alone,
+#=EXRESULT PASS
+
 @{FOO} = /foo /bar

=== modified file 'parser/tst/simple_tests/bare_include_tests/ignored_suffix_2/good.dpkg-new.include'
--- parser/tst/simple_tests/bare_include_tests/ignored_suffix_2/good.dpkg-new.include   2015-07-09 00:19:57 +0000
+++ parser/tst/simple_tests/bare_include_tests/ignored_suffix_2/good.dpkg-new.include   2015-07-11 15:23:57 +0000
@@ -1,2 +1,6 @@
-# Valid include
+#=DESCRIPTION Valid include
+#
+# if parsed stand-alone,
+#=EXRESULT PASS
+
 @{FOO} = /foo /bar

=== modified file 'parser/tst/simple_tests/bare_include_tests/includes_okay_helper.include'
--- parser/tst/simple_tests/bare_include_tests/includes_okay_helper.include     2015-07-09 00:19:57 +0000
+++ parser/tst/simple_tests/bare_include_tests/includes_okay_helper.include     2015-07-11 15:22:05 +0000
@@ -1,6 +1,9 @@
 #
 #=DESCRIPTION A helper for includes_okay.sd
 #
+# if parsed standalone,
+#=EXRESULT FAIL
+#
   include <includes/fonts>
 
   /tmp/** r,



Regards,

Christian Boltz
-- 
[Newbie] und wenn wir wollen, daß er ein brauchbarer Regular wird, dann
müssen wir uns den korrekt konfigurieren.  Nun leider/zum Glück handelt
es um einen Menschen. Da ist es nicht mit "vi /etc/sysconfig/grosshirn"
und "rcgehirn reload" getan.         [Kristian Koehntopp in suse-linux]




More information about the AppArmor mailing list