Convert test_sysctl test to prog_tests with minimal change to the
tests themselves.

Signed-off-by: Jerome Marchand <jmarchan@redhat.com>
---
 tools/testing/selftests/bpf/.gitignore        |  1 -
 tools/testing/selftests/bpf/Makefile          |  5 ++-
 .../bpf/{ => prog_tests}/test_sysctl.c        | 32 ++++---------------
 3 files changed, 9 insertions(+), 29 deletions(-)
 rename tools/testing/selftests/bpf/{ => prog_tests}/test_sysctl.c (98%)

diff --git a/tools/testing/selftests/bpf/.gitignore b/tools/testing/selftests/bpf/.gitignore
index e2a2c46c008b1..3d8378972d26c 100644
--- a/tools/testing/selftests/bpf/.gitignore
+++ b/tools/testing/selftests/bpf/.gitignore
@@ -21,7 +21,6 @@ test_lirc_mode2_user
 flow_dissector_load
 test_tcpnotify_user
 test_libbpf
-test_sysctl
 xdping
 test_cpp
 *.d
diff --git a/tools/testing/selftests/bpf/Makefile b/tools/testing/selftests/bpf/Makefile
index 66bb50356be08..53dc08d905bd1 100644
--- a/tools/testing/selftests/bpf/Makefile
+++ b/tools/testing/selftests/bpf/Makefile
@@ -70,7 +70,7 @@ endif
 # Order correspond to 'make run_tests' order
 TEST_GEN_PROGS = test_verifier test_tag test_maps test_lru_map test_progs \
 	test_sockmap \
-	test_tcpnotify_user test_sysctl \
+	test_tcpnotify_user \
 	test_progs-no_alu32
 TEST_INST_SUBDIRS := no_alu32
 
@@ -215,7 +215,7 @@ ifeq ($(VMLINUX_BTF),)
 $(error Cannot find a vmlinux for VMLINUX_BTF at any of "$(VMLINUX_BTF_PATHS)")
 endif
 
-# Define simple and short `make test_progs`, `make test_sysctl`, etc targets
+# Define simple and short `make test_progs`, `make test_maps`, etc targets
 # to build individual tests.
 # NOTE: Semicolon at the end is critical to override lib.mk's default static
 # rule for binaries.
@@ -324,7 +324,6 @@ NETWORK_HELPERS := $(OUTPUT)/network_helpers.o
 $(OUTPUT)/test_sockmap: $(CGROUP_HELPERS) $(TESTING_HELPERS)
 $(OUTPUT)/test_tcpnotify_user: $(CGROUP_HELPERS) $(TESTING_HELPERS) $(TRACE_HELPERS)
 $(OUTPUT)/test_sock_fields: $(CGROUP_HELPERS) $(TESTING_HELPERS)
-$(OUTPUT)/test_sysctl: $(CGROUP_HELPERS) $(TESTING_HELPERS)
 $(OUTPUT)/test_tag: $(TESTING_HELPERS)
 $(OUTPUT)/test_lirc_mode2_user: $(TESTING_HELPERS)
 $(OUTPUT)/xdping: $(TESTING_HELPERS)
diff --git a/tools/testing/selftests/bpf/test_sysctl.c b/tools/testing/selftests/bpf/prog_tests/test_sysctl.c
similarity index 98%
rename from tools/testing/selftests/bpf/test_sysctl.c
rename to tools/testing/selftests/bpf/prog_tests/test_sysctl.c
index bcdbd27f22f08..049671361f8fa 100644
--- a/tools/testing/selftests/bpf/test_sysctl.c
+++ b/tools/testing/selftests/bpf/prog_tests/test_sysctl.c
@@ -1,22 +1,8 @@
 // SPDX-License-Identifier: GPL-2.0
 // Copyright (c) 2019 Facebook
 
-#include <fcntl.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include <linux/filter.h>
-
-#include <bpf/bpf.h>
-#include <bpf/libbpf.h>
-
-#include <bpf/bpf_endian.h>
-#include "bpf_util.h"
+#include "test_progs.h"
 #include "cgroup_helpers.h"
-#include "testing_helpers.h"
 
 #define CG_PATH			"/foo"
 #define MAX_INSNS		512
@@ -1608,26 +1594,22 @@ static int run_tests(int cgfd)
 	return fails ? -1 : 0;
 }
 
-int main(int argc, char **argv)
+void test_sysctl(void)
 {
 	int cgfd = -1;
-	int err = 0;
 
 	cgfd = cgroup_setup_and_join(CG_PATH);
-	if (cgfd < 0)
-		goto err;
+	if (CHECK_FAIL(cgfd < 0))
+		goto out;
 
 	/* Use libbpf 1.0 API mode */
 	libbpf_set_strict_mode(LIBBPF_STRICT_ALL);
 
-	if (run_tests(cgfd))
-		goto err;
+	if (CHECK_FAIL(run_tests(cgfd)))
+		goto out;
 
-	goto out;
-err:
-	err = -1;
 out:
 	close(cgfd);
 	cleanup_cgroup_environment();
-	return err;
+	return;
 }
-- 
2.49.0

On 6/10/25 2:19 AM, Jerome Marchand wrote:
> Convert test_sysctl test to prog_tests with minimal change to the
> tests themselves.
>
> Signed-off-by: Jerome Marchand <jmarchan@redhat.com>
> ---
>   tools/testing/selftests/bpf/.gitignore        |  1 -
>   tools/testing/selftests/bpf/Makefile          |  5 ++-
>   .../bpf/{ => prog_tests}/test_sysctl.c        | 32 ++++---------------
>   3 files changed, 9 insertions(+), 29 deletions(-)
>   rename tools/testing/selftests/bpf/{ => prog_tests}/test_sysctl.c (98%)
>
> diff --git a/tools/testing/selftests/bpf/.gitignore b/tools/testing/selftests/bpf/.gitignore
> index e2a2c46c008b1..3d8378972d26c 100644
> --- a/tools/testing/selftests/bpf/.gitignore
> +++ b/tools/testing/selftests/bpf/.gitignore
> @@ -21,7 +21,6 @@ test_lirc_mode2_user
>   flow_dissector_load
>   test_tcpnotify_user
>   test_libbpf
> -test_sysctl
>   xdping
>   test_cpp
>   *.d
> diff --git a/tools/testing/selftests/bpf/Makefile b/tools/testing/selftests/bpf/Makefile
> index 66bb50356be08..53dc08d905bd1 100644
> --- a/tools/testing/selftests/bpf/Makefile
> +++ b/tools/testing/selftests/bpf/Makefile
> @@ -70,7 +70,7 @@ endif
>   # Order correspond to 'make run_tests' order
>   TEST_GEN_PROGS = test_verifier test_tag test_maps test_lru_map test_progs \
>   	test_sockmap \
> -	test_tcpnotify_user test_sysctl \
> +	test_tcpnotify_user \
>   	test_progs-no_alu32
>   TEST_INST_SUBDIRS := no_alu32
>   
> @@ -215,7 +215,7 @@ ifeq ($(VMLINUX_BTF),)
>   $(error Cannot find a vmlinux for VMLINUX_BTF at any of "$(VMLINUX_BTF_PATHS)")
>   endif
>   
> -# Define simple and short `make test_progs`, `make test_sysctl`, etc targets
> +# Define simple and short `make test_progs`, `make test_maps`, etc targets
>   # to build individual tests.
>   # NOTE: Semicolon at the end is critical to override lib.mk's default static
>   # rule for binaries.
> @@ -324,7 +324,6 @@ NETWORK_HELPERS := $(OUTPUT)/network_helpers.o
>   $(OUTPUT)/test_sockmap: $(CGROUP_HELPERS) $(TESTING_HELPERS)
>   $(OUTPUT)/test_tcpnotify_user: $(CGROUP_HELPERS) $(TESTING_HELPERS) $(TRACE_HELPERS)
>   $(OUTPUT)/test_sock_fields: $(CGROUP_HELPERS) $(TESTING_HELPERS)
> -$(OUTPUT)/test_sysctl: $(CGROUP_HELPERS) $(TESTING_HELPERS)
>   $(OUTPUT)/test_tag: $(TESTING_HELPERS)
>   $(OUTPUT)/test_lirc_mode2_user: $(TESTING_HELPERS)
>   $(OUTPUT)/xdping: $(TESTING_HELPERS)
> diff --git a/tools/testing/selftests/bpf/test_sysctl.c b/tools/testing/selftests/bpf/prog_tests/test_sysctl.c
> similarity index 98%
> rename from tools/testing/selftests/bpf/test_sysctl.c
> rename to tools/testing/selftests/bpf/prog_tests/test_sysctl.c
> index bcdbd27f22f08..049671361f8fa 100644
> --- a/tools/testing/selftests/bpf/test_sysctl.c
> +++ b/tools/testing/selftests/bpf/prog_tests/test_sysctl.c
> @@ -1,22 +1,8 @@
>   // SPDX-License-Identifier: GPL-2.0
>   // Copyright (c) 2019 Facebook
>   
> -#include <fcntl.h>
> -#include <stdint.h>
> -#include <stdio.h>
> -#include <stdlib.h>
> -#include <string.h>
> -#include <unistd.h>
> -
> -#include <linux/filter.h>
> -
> -#include <bpf/bpf.h>
> -#include <bpf/libbpf.h>
> -
> -#include <bpf/bpf_endian.h>
> -#include "bpf_util.h"
> +#include "test_progs.h"
>   #include "cgroup_helpers.h"
> -#include "testing_helpers.h"
>   
>   #define CG_PATH			"/foo"
>   #define MAX_INSNS		512
> @@ -1608,26 +1594,22 @@ static int run_tests(int cgfd)
>   	return fails ? -1 : 0;
>   }
>   
> -int main(int argc, char **argv)
> +void test_sysctl(void)
>   {
>   	int cgfd = -1;

-1 is not needed.

> -	int err = 0;
>   
>   	cgfd = cgroup_setup_and_join(CG_PATH);
> -	if (cgfd < 0)
> -		goto err;
> +	if (CHECK_FAIL(cgfd < 0))

Use ASSERT* macros. For example, if (!ASSERT_OK_FD(cgfd, "create cgroup"))

> +		goto out;
>   
>   	/* Use libbpf 1.0 API mode */
>   	libbpf_set_strict_mode(LIBBPF_STRICT_ALL);

This is not needed.

>   
> -	if (run_tests(cgfd))
> -		goto err;
> +	if (CHECK_FAIL(run_tests(cgfd)))

if (!ASSERT_OK(run_tests(cgfd), "run_tests"))

> +		goto out;
>   
> -	goto out;
> -err:
> -	err = -1;
>   out:
>   	close(cgfd);
>   	cleanup_cgroup_environment();
> -	return err;
> +	return;
>   }