[apparmor] [patch 18/21] Make dbus tests be conditionally run based on pkg-config

[john.johansen at canonical.com]

The addition of the dbus tests requires dbus dev libraries be installed
to run the test suite. This is not always desirable or even possible.

So make building and running the dbus tests conditional on the
pkg-config info from those libs. If they are not present output a
message about skipping the tests.

This patch contains the review fix from sbeattie

Signed-off-by: John Johansen <john.johansen at canonical.com>


---
 tests/regression/apparmor/Makefile |   22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

--- 2.9-test.orig/tests/regression/apparmor/Makefile
+++ 2.9-test/tests/regression/apparmor/Makefile
@@ -66,9 +66,6 @@
     chown.c \
     clone.c \
     coredump.c \
-    dbus_eavesdrop.c \
-    dbus_message.c \
-    dbus_service.c \
     deleted.c \
     environ.c \
     env_check.c \
@@ -125,6 +122,17 @@
 SRC+=syscall_ioperm.c syscall_iopl.c
 endif
 
+#only do dbus if proper libs are installl
+ifneq (,$(shell pkg-config --exists dbus-1 && echo TRUE))
+SRC+=dbus_eavesdrop.c dbus_message.c dbus_service.c
+else
+$(warning ${nl}\
+************************************************************************${nl}\
+No dbus pkg-config skipping dbus_eavesdrop dbus_message dbus_services tests ...${nl})\
+Install libdbus-1-dev or equivalent package to build and run these tests${nl}\
+************************************************************************${nl})
+endif
+
 EXEC=$(SRC:%.c=%)
 
 TESTS=access \
@@ -138,9 +146,6 @@
       chdir \
       clone \
       coredump \
-      dbus_eavesdrop \
-      dbus_message \
-      dbus_service \
       deleted \
       environ \
       exec \
@@ -179,6 +184,11 @@
       xattrs\
       longpath
 
+#only do dbus if proper libs are installl
+ifneq (,$(shell pkg-config --exists dbus-1 && echo TRUE))
+TESTS+=dbus_eavesdrop dbus_message dbus_service
+endif
+
 # Tests that can crash the kernel should be placed here
 RISKY_TESTS=