[apparmor] [PATCH 1/2] libapparmor: Fix parallel make dependency issue in testsuite

Tyler Hicks tyhicks at canonical.com
Thu Apr 20 19:28:28 UTC 2017


A multi job `make check` command could fail due to check-local running
before the check-DEJAGNU target, which is automatically generated by
automake, would complete. This would result in a build failure due to
libaalogparse.log not yet existing.

Fix the issue by depending on the check-DEJAGNU target.

Signed-off-by: Tyler Hicks <tyhicks at canonical.com>
---

I'm nominating this patch for 2.11 and trunk.

 libraries/libapparmor/testsuite/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/libapparmor/testsuite/Makefile.am b/libraries/libapparmor/testsuite/Makefile.am
index 8f43cec..2cde5cc 100644
--- a/libraries/libapparmor/testsuite/Makefile.am
+++ b/libraries/libapparmor/testsuite/Makefile.am
@@ -17,7 +17,7 @@ clean-local:
 	rm -rf tmp.err.* tmp.out.* site.exp site.bak test_multi/out
 	rm -f libaalogparse.log libaalogparse.sum
 
-check-local:
+check-local: check-DEJAGNU
 	if ! test -f libaalogparse.log ; then echo '*** libaalogparse.log not found - is dejagnu installed? ***'; exit 1; fi
 	if grep ERROR libaalogparse.log ; then exit 1 ; fi
 
-- 
2.7.4




More information about the AppArmor mailing list