[apparmor] [PATCH] tests: Adjust stacking tests build check for 2.11 Beta 1 release

Tyler Hicks tyhicks at canonical.com
Thu Mar 24 15:31:55 UTC 2016


I configured the stacking test binary to only be built when libapparmor
2.11 is present. The versioning of the 2.11 Beta 1 release (2.10.95)
causes that check to fail and the stacking tests to not be used.

This patch adjusts the libapparmor version check to be aware of the 2.11
Beta 1 versioning.

Signed-off-by: Tyler Hicks <tyhicks at canonical.com>
---
 tests/regression/apparmor/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/regression/apparmor/Makefile b/tests/regression/apparmor/Makefile
index 56facc4..ca9a294 100644
--- a/tests/regression/apparmor/Makefile
+++ b/tests/regression/apparmor/Makefile
@@ -167,13 +167,13 @@ ifdef USE_SYSTEM
     ************************************************************************${nl})
   endif
 
-  ifneq (,$(shell pkg-config --atleast-version 2.11 libapparmor && echo TRUE))
+  ifneq (,$(shell pkg-config --atleast-version 2.10.95 libapparmor && echo TRUE))
     SRC+=stacking.c
     CONDITIONAL_TESTS+=exec_stack stackonexec stackprofile
   else
     $(warning ${nl}\
     ************************************************************************${nl}\
-    Skipping stacking tests: requires libapparmor 2.11 or newer ...${nl}\
+    Skipping stacking tests: requires libapparmor 2.11 Beta 1 or newer ...${nl}\
     ************************************************************************${nl})
   endif
 else
-- 
2.7.4




More information about the AppArmor mailing list