From c79d1e69688dc46306245f8738270fda963be189 Mon Sep 17 00:00:00 2001 From: Anders Roxell Date: Fri, 16 Feb 2018 21:06:37 +0100 Subject: [PATCH] selftest: net: reuseport_bpf_numa: don't fail if no numa support Signed-off-by: Anders Roxell --- tools/testing/selftests/lib.mk | 2 +- tools/testing/selftests/net/reuseport_bpf_numa.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/tools/testing/selftests/lib.mk b/tools/testing/selftests/lib.mk index 7de482a0519d..3c6080ef1a33 100644 --- a/tools/testing/selftests/lib.mk +++ b/tools/testing/selftests/lib.mk @@ -77,7 +77,7 @@ endif define EMIT_TESTS @for TEST in $(TEST_GEN_PROGS) $(TEST_CUSTOM_PROGS) $(TEST_PROGS); do \ BASENAME_TEST=`basename $$TEST`; \ - echo "(./$$BASENAME_TEST >> \$$OUTPUT 2>&1 && echo \"selftests: $$BASENAME_TEST [PASS]\") || echo \"selftests: $$BASENAME_TEST [FAIL]\""; \ + echo "(./$$BASENAME_TEST >> \$$OUTPUT 2>&1 ; if [ \$$? -eq 0 ]; then echo \"selftests: $$BASENAME_TEST [PASS]\"; elif [ \$$? -eq 99 ]; then echo \"selftests: $$BASENAME_TEST [SKIP]\"; else echo \"selftests: $$BASENAME_TEST [FAIL]\"; fi;)"; \ done; endef diff --git a/tools/testing/selftests/net/reuseport_bpf_numa.c b/tools/testing/selftests/net/reuseport_bpf_numa.c index 365c32e84189..8aa639abcab6 100644 --- a/tools/testing/selftests/net/reuseport_bpf_numa.c +++ b/tools/testing/selftests/net/reuseport_bpf_numa.c @@ -228,8 +228,10 @@ int main(void) { int *rcv_fd, nodes; - if (numa_available() < 0) - error(1, errno, "no numa api support"); + if (numa_available() < 0) { + fprintf(stderr, "no numa api support"); + return 99; + } nodes = numa_max_node() + 1; -- 2.11.0