[PATCH bpf-next v2 1/4] selftests/bpf: reorder test_progs sources alphabetically

Alexis Lothoré (eBPF Foundation) posted 4 patches 2 weeks, 3 days ago
There is a newer version of this series
[PATCH bpf-next v2 1/4] selftests/bpf: reorder test_progs sources alphabetically
Posted by Alexis Lothoré (eBPF Foundation) 2 weeks, 3 days ago
Update test_progs sources listing to make those sorted alphabetically

Signed-off-by: Alexis Lothoré (eBPF Foundation) <alexis.lothore@bootlin.com>
---
Changes in v2:
- new commit
---
 tools/testing/selftests/bpf/Makefile | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/tools/testing/selftests/bpf/Makefile b/tools/testing/selftests/bpf/Makefile
index fd42b7193d4e..0270b0a6dd79 100644
--- a/tools/testing/selftests/bpf/Makefile
+++ b/tools/testing/selftests/bpf/Makefile
@@ -729,25 +729,25 @@ $(VERIFY_SIG_HDR): $(VERIFICATION_CERT)
 # Define test_progs test runner.
 TRUNNER_TESTS_DIR := prog_tests
 TRUNNER_BPF_PROGS_DIR := progs
-TRUNNER_EXTRA_SOURCES := test_progs.c		\
-			 cgroup_helpers.c	\
-			 trace_helpers.c	\
-			 network_helpers.c	\
-			 testing_helpers.c	\
-			 btf_helpers.c		\
-			 cap_helpers.c		\
-			 unpriv_helpers.c 	\
-			 netlink_helpers.c	\
-			 jit_disasm_helpers.c	\
-			 io_helpers.c		\
-			 test_loader.c		\
-			 xsk.c			\
-			 disasm.c		\
-			 disasm_helpers.c	\
-			 json_writer.c 		\
+TRUNNER_EXTRA_SOURCES := btf_helpers.c			\
+			 cap_helpers.c			\
+			 cgroup_helpers.c		\
+			 disasm.c			\
+			 disasm_helpers.c		\
+			 flow_dissector_load.h		\
+			 ip_check_defrag_frags.h	\
+			 io_helpers.c			\
+			 jit_disasm_helpers.c		\
+			 json_writer.c 			\
+			 netlink_helpers.c		\
+			 network_helpers.c		\
+			 test_loader.c			\
+			 test_progs.c			\
+			 testing_helpers.c		\
+			 trace_helpers.c		\
+			 unpriv_helpers.c 		\
 			 $(VERIFY_SIG_HDR)		\
-			 flow_dissector_load.h	\
-			 ip_check_defrag_frags.h
+			 xsk.c
 TRUNNER_LIB_SOURCES := find_bit.c
 TRUNNER_EXTRA_FILES := \
 		       $(OUTPUT)/xdp_synproxy				\

-- 
2.52.0

Re: [PATCH bpf-next v2 1/4] selftests/bpf: reorder test_progs sources alphabetically
Posted by Alexei Starovoitov 2 weeks, 3 days ago
On Wed, Jan 21, 2026 at 7:18 AM Alexis Lothoré (eBPF Foundation)
<alexis.lothore@bootlin.com> wrote:
>
> Update test_progs sources listing to make those sorted alphabetically
...

> -TRUNNER_EXTRA_SOURCES := test_progs.c          \
> -                        cgroup_helpers.c       \
> -                        trace_helpers.c        \
> -                        network_helpers.c      \
> -                        testing_helpers.c      \
> -                        btf_helpers.c          \
> -                        cap_helpers.c          \
> -                        unpriv_helpers.c       \
> -                        netlink_helpers.c      \
> -                        jit_disasm_helpers.c   \
> -                        io_helpers.c           \
> -                        test_loader.c          \
> -                        xsk.c                  \
> -                        disasm.c               \
> -                        disasm_helpers.c       \
> -                        json_writer.c          \
> +TRUNNER_EXTRA_SOURCES := btf_helpers.c                 \
> +                        cap_helpers.c                  \
> +                        cgroup_helpers.c               \


no need. Even if we sort it now it will not stick.
Files might get renamed, new files added to the end, etc.
Just add whatever you need to the end.

Also see that there is a merge conflict. Pls respin.
Re: [PATCH bpf-next v2 1/4] selftests/bpf: reorder test_progs sources alphabetically
Posted by Alexis Lothoré 2 weeks, 3 days ago
Hi Alexei,

On Wed Jan 21, 2026 at 6:26 PM CET, Alexei Starovoitov wrote:
> On Wed, Jan 21, 2026 at 7:18 AM Alexis Lothoré (eBPF Foundation)
> <alexis.lothore@bootlin.com> wrote:
>>
>> Update test_progs sources listing to make those sorted alphabetically
> ...
>
>> -TRUNNER_EXTRA_SOURCES := test_progs.c          \
>> -                        cgroup_helpers.c       \
>> -                        trace_helpers.c        \
>> -                        network_helpers.c      \
>> -                        testing_helpers.c      \
>> -                        btf_helpers.c          \
>> -                        cap_helpers.c          \
>> -                        unpriv_helpers.c       \
>> -                        netlink_helpers.c      \
>> -                        jit_disasm_helpers.c   \
>> -                        io_helpers.c           \
>> -                        test_loader.c          \
>> -                        xsk.c                  \
>> -                        disasm.c               \
>> -                        disasm_helpers.c       \
>> -                        json_writer.c          \
>> +TRUNNER_EXTRA_SOURCES := btf_helpers.c                 \
>> +                        cap_helpers.c                  \
>> +                        cgroup_helpers.c               \
>
>
> no need. Even if we sort it now it will not stick.
> Files might get renamed, new files added to the end, etc.
> Just add whatever you need to the end.

Ok, I'll remove it and just add bpftool_helpers at the end.

> Also see that there is a merge conflict. Pls respin.

ACK, will do.

Thanks,

Alexis




-- 
Alexis Lothoré, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com