[apparmor] [patch] parser tests - fix dependency for parallel builds
Tyler Hicks
tyhicks at canonical.com
Thu Oct 31 18:50:45 UTC 2013
On 2013-10-31 11:47:46, Steve Beattie wrote:
> On Thu, Oct 31, 2013 at 11:43:25AM -0700, Steve Beattie wrote:
> > The parser sanity test make target does not directly depend on the make
> > targets that generate the tests consumed by the sanity test, leading to
> > runs that did not verify all the test cases when make check is invoked
> > with parallelism (e.g. make check -j4). This patch against trunk fixes
> > the issue (it's a subset of the '[patch 6/8] parser - use new caching
> > test script' patch from my last patch submission).
>
> And here's the same fix for the 2.8 branch (which doesn't have the dbus
> patches applied, so is slightly different)
>
> Signed-off-by: Steve Beattie <steve at nxnw.org>
This one looks good, as well.
Acked-by: Tyler Hicks <tyhicks at canonical.com>
>
> ---
> parser/tst/Makefile | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> Index: b/parser/tst/Makefile
> ===================================================================
> --- a/parser/tst/Makefile
> +++ b/parser/tst/Makefile
> @@ -13,7 +13,7 @@ endif
> all: tests
>
> .PHONY: tests error_output gen_xtrans parser_sanity caching minimize
> -tests: error_output gen_xtrans parser_sanity caching minimize
> +tests: error_output parser_sanity caching minimize
>
> GEN_TRANS_DIRS=simple_tests/generated_x/ simple_tests/generated_perms_leading/ simple_tests/generated_perms_safe/
>
> @@ -35,7 +35,7 @@ error_output: $(PARSER)
> grep -q "AppArmor parser error for errors/multi_include.sd in errors/multi_include.sd at line 12: Could not open 'failure'"
> @echo "Error Output: PASS"
>
> -parser_sanity: $(PARSER)
> +parser_sanity: $(PARSER) gen_xtrans
> $(Q)${PROVE} ${PROVE_ARG} ${TESTS}
>
> caching: $(PARSER)
>
>
> --
> Steve Beattie
> <sbeattie at ubuntu.com>
> http://NxNW.org/~steve/
> --
> AppArmor mailing list
> AppArmor at lists.ubuntu.com
> Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/apparmor
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <https://lists.ubuntu.com/archives/apparmor/attachments/20131031/3573a9f6/attachment.pgp>
More information about the AppArmor
mailing list