On 03/17/2014 10:54 PM, Steve Beattie wrote:
> On Mon, Mar 17, 2014 at 04:29:28PM -0700, [email protected] wrote:
>> 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 <[email protected]>
>
> One nit to fix, otherwise Acked-by: Steve Beattie <[email protected]>
>
>> --- 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})\
>
> =================^
> This paren closes the $(warning function and so breaks things (perhaps
> you got quilt-bit again?). Remove it.
>
Sigh yep
>> +Install libdbus-1-dev or equivalent package to build and run these
>> tests${nl}\
>> +************************************************************************${nl})
>> +endif
>> +
>
>
>
--
AppArmor mailing list
[email protected]
Modify settings or unsubscribe at:
https://lists.ubuntu.com/mailman/listinfo/apparmor
