* [PATCH] selinux-testsuite: Stop Infiniband building if not enabled
@ 2017-10-19 15:56 Richard Haines
2017-10-23 20:17 ` Stephen Smalley
0 siblings, 1 reply; 2+ messages in thread
From: Richard Haines @ 2017-10-19 15:56 UTC (permalink / raw)
To: selinux
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>
---
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)
--
2.13.6
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] selinux-testsuite: Stop Infiniband building if not enabled
2017-10-19 15:56 [PATCH] selinux-testsuite: Stop Infiniband building if not enabled Richard Haines
@ 2017-10-23 20:17 ` Stephen Smalley
0 siblings, 0 replies; 2+ messages in thread
From: Stephen Smalley @ 2017-10-23 20:17 UTC (permalink / raw)
To: Richard Haines, selinux
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)
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-10-23 20:17 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-10-19 15:56 [PATCH] selinux-testsuite: Stop Infiniband building if not enabled Richard Haines
2017-10-23 20:17 ` Stephen Smalley
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.