[apparmor] [patch] Add DESCRIPTION and EXRESULT to new simple_tests includes
John Johansen
john.johansen at canonical.com
Sat Jul 11 18:58:16 UTC 2015
On 07/11/2015 08:54 AM, Christian Boltz wrote:
> 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.
>
>
Acked-by: John Johansen <john.johansen at canonical.com>
> [ 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
>
More information about the AppArmor
mailing list