[prev in list] [next in list] [prev in thread] [next in thread] 

List:       selinux
Subject:    Re: [PATCH] selinux-testsuite: Stop Infiniband building if not enabled
From:       Stephen Smalley <sds () tycho ! nsa ! gov>
Date:       2017-10-23 20:17:07
Message-ID: 1508789827.24902.6.camel () tycho ! nsa ! gov
[Download RAW message or body]

On Thu, 2017-10-19 at 16:56 +0100, Richard Haines wrote:
> The default is not to test, however it still tries to build
> create_modify_qp.c that requires a header and library that may not
> exist.
> 
> Signed-off-by: Richard Haines <richard_c_haines@btinternet.com>

Thanks, applied.

> ---
>  tests/infiniband_pkey/Makefile | 10 +++++++++-
>  1 file changed, 9 insertions(+), 1 deletion(-)
> 
> diff --git a/tests/infiniband_pkey/Makefile
> b/tests/infiniband_pkey/Makefile
> index 60f0d24..4fa6fb2 100644
> --- a/tests/infiniband_pkey/Makefile
> +++ b/tests/infiniband_pkey/Makefile
> @@ -2,6 +2,14 @@ TARGETS=create_modify_qp
>  
>  LDLIBS+= -libverbs
>  
> -all: $(TARGETS)
> +RESULT=$(shell grep "SELINUX_INFINIBAND_PKEY_TEST=0"
> ./ibpkey_test.conf)
> +
> +ifeq  ($(RESULT), )
> +    all: $(TARGETS)
> +else
> +    all:
> +	@echo "Infiniband test disabled"
> +endif
> +
>  clean:
>  	rm -f $(TARGETS)
[prev in list] [next in list] [prev in thread] [next in thread]