From 153f3370c91e17d70c6284b836fb69829a62f955 Mon Sep 17 00:00:00 2001 From: Geliang Tang Date: Thu, 3 Oct 2024 14:23:39 +0800 Subject: [PATCH] TEST bpf userspace fix fix Signed-off-by: Geliang Tang --- tools/testing/selftests/bpf/Makefile | 2 +- tools/testing/selftests/bpf/prog_tests/mptcp.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/bpf/Makefile b/tools/testing/selftests/bpf/Makefile index 662825f55f99c..3969baa70b5fc 100644 --- a/tools/testing/selftests/bpf/Makefile +++ b/tools/testing/selftests/bpf/Makefile @@ -41,7 +41,7 @@ srctree := $(patsubst %/,%,$(dir $(srctree))) endif CFLAGS += -g $(OPT_FLAGS) -rdynamic \ - -Wall -Werror -fno-omit-frame-pointer \ + -fno-omit-frame-pointer \ $(GENFLAGS) $(SAN_CFLAGS) $(LIBELF_CFLAGS) \ -I$(CURDIR) -I$(INCLUDE_DIR) -I$(GENDIR) -I$(LIBDIR) \ -I$(TOOLSINCDIR) -I$(APIDIR) -I$(OUTPUT) diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c b/tools/testing/selftests/bpf/prog_tests/mptcp.c index d8ae0d8ec61ef..bd92539111994 100644 --- a/tools/testing/selftests/bpf/prog_tests/mptcp.c +++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c @@ -600,9 +600,13 @@ static int userspace_pm_init(enum mptcp_pm_type pm_type) static void userspace_pm_cleanup(void) { + //SYS(fail, "ip netns exec %s cat %s", NS_TEST, PM_EVENTS); + SYS_NOFAIL("ip netns exec %s killall %s > /dev/null 2>&1", NS_TEST, PM_CTL); SYS_NOFAIL("ip netns exec %s rm -rf %s", NS_TEST, PM_EVENTS); +//fail: + ; } static char *get_events_str(char *type)