[apparmor] [patch] parser tests - fix dependency for parallel builds

[Steve Beattie]

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).

Signed-off-by: Steve Beattie <steve at nxnw.org>

---
 parser/tst/Makefile |    6 +++---
 1 file changed, 3 insertions(+), 3 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 equality
-tests: error_output gen_xtrans gen_dbus parser_sanity caching minimize equality
+tests: error_output parser_sanity caching minimize equality
 
 GEN_TRANS_DIRS=simple_tests/generated_x/ simple_tests/generated_perms_leading/ simple_tests/generated_perms_safe/ simple_tests/generated_dbus
 
@@ -38,7 +38,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 gen_dbus
 	$(Q)LANG=C APPARMOR_PARSER="$(PARSER)" ${PROVE} ${PROVE_ARG} ${TESTS}
 
 caching: $(PARSER)
@@ -50,7 +50,7 @@ minimize: $(PARSER)
 equality: $(PARSER)
 	LANG=C APPARMOR_PARSER="$(PARSER)" ./equality.sh
 
-valgrind: $(PARSER)
+valgrind: $(PARSER) gen_xtrans gen_dbus
 	LANG=C ./valgrind_simple.py -p "$(PARSER)" -v simple_tests
 
 $(PARSER):

-- 
Steve Beattie
<sbeattie at ubuntu.com>
http://NxNW.org/~steve/
-------------- 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/1a1841ae/attachment.pgp>