Skip to contentSkip to conversation

selftests/bpf: avoid generating untracked files when running bpf selftests

PATCH Applied Jiayuan Chen 3 participants 3 messages Dec 24, 2024 – Jan 6, 2025

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 selftests/bpf: avoid generating untracked files when running bpf selftests

Currently, when we run the BPF selftests with the following command:
'make -C tools/testing/selftests TARGETS=bpf SKIP_TARGETS=""'

The command generates untracked files and directories with make version less than 4.4:
'''
Untracked files:
(use "git add <file>..." to include in what will be committed)
tools/testing/selftests/bpfFEATURE-DUMP.selftests tools/testing/selftests/bpffeature/
'''
We lost slash after word "bpf".

The reason is slash appending code is as follow:
'''
OUTPUT := $(OUTPUT)/
$(eval include ../../../build/Makefile.feature)
OUTPUT := $(patsubst %/,%,$(OUTPUT))
'''

This way of assigning values to OUTPUT will never be effective for the variable OUTPUT provided via the command argument [1] and bpf makefile is called from parent Makfile(tools/testing/selftests/Makefile) like:
'''
all:
...

	$(MAKE) OUTPUT=$$BUILD_TARGET -C $$TARGET

'''

According to GNU make, we can use override Directive to fix this issue [2].

[1]: https://www.gnu.org/software/make/manual/make.html#Overriding
[2]: https://www.gnu.org/software/make/manual/make.html#Override-Directive

Fixes dc3a8804d790 ("selftests/bpf: Adapt OUTPUT appending logic to lower versions of Make")

---
v1->v2: fix patchwork check fail.
---

---
 tools/testing/selftests/bpf/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
tools/testing/selftests/bpf/Makefile +2 -2
index 9e870e519c30..eb4d21651aa7 100644
@@ -202,9 +202,9 @@ ifeq ($(shell expr $(MAKE_VERSION) \>= 4.4), 1)
 $(let OUTPUT,$(OUTPUT)/,\
 	$(eval include ../../../build/Makefile.feature))
 else
-OUTPUT := $(OUTPUT)/
+override OUTPUT := $(OUTPUT)/
 $(eval include ../../../build/Makefile.feature)
-OUTPUT := $(patsubst %/,%,$(OUTPUT))
+override OUTPUT := $(patsubst %/,%,$(OUTPUT))
 endif
 endif
 
Signature · 1 line
2.43.5
Acked-by on v2 1/1
#1 lore raw
Quoted 29 lines · Jiayuan Chen

Currently, when we run the BPF selftests with the following command:
'make -C tools/testing/selftests TARGETS=bpf SKIP_TARGETS=""'

The command generates untracked files and directories with make version less than 4.4:
'''
Untracked files:
(use "git add <file>..." to include in what will be committed)
tools/testing/selftests/bpfFEATURE-DUMP.selftests tools/testing/selftests/bpffeature/
'''
We lost slash after word "bpf".

The reason is slash appending code is as follow:
'''
OUTPUT := $(OUTPUT)/
$(eval include ../../../build/Makefile.feature)
OUTPUT := $(patsubst %/,%,$(OUTPUT))
'''

This way of assigning values to OUTPUT will never be effective for the variable OUTPUT provided via the command argument [1] and bpf makefile is called from parent Makfile(tools/testing/selftests/Makefile) like:
'''
all:
...

	$(MAKE) OUTPUT=$$BUILD_TARGET -C $$TARGET

'''

Quoted 7 lines

According to GNU make, we can use override Directive to fix this issue [2].

[1]: https://www.gnu.org/software/make/manual/make.html#Overriding
[2]: https://www.gnu.org/software/make/manual/make.html#Override-Directive

Fixes dc3a8804d790 ("selftests/bpf: Adapt OUTPUT appending logic to lower versions of Make")

lgtm, tested with make 4.3

jirka

Quoted 27 lines

---
v1->v2: fix patchwork check fail.
---

---
 tools/testing/selftests/bpf/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
tools/testing/selftests/bpf/Makefile +2 -2
index 9e870e519c30..eb4d21651aa7 100644
@@ -202,9 +202,9 @@ ifeq ($(shell expr $(MAKE_VERSION) \>= 4.4), 1)
 $(let OUTPUT,$(OUTPUT)/,\
 	$(eval include ../../../build/Makefile.feature))
 else
-OUTPUT := $(OUTPUT)/
+override OUTPUT := $(OUTPUT)/
 $(eval include ../../../build/Makefile.feature)
-OUTPUT := $(patsubst %/,%,$(OUTPUT))
+override OUTPUT := $(patsubst %/,%,$(OUTPUT))
 endif
 endif
 
Signature · 1 line
2.43.5
#2 lore raw
In reply to Jiayuan Chen
This patch was applied to bpf/bpf-next.git (master) by Daniel Borkmann <[email protected]>:

Hello:

This patch was applied to bpf/bpf-next.git (master) by Daniel Borkmann <[email protected]>:

Quoted 13 lines · On Tue, 24 Dec 2024 15:59:57 +0800 you wrote:

Currently, when we run the BPF selftests with the following command:
'make -C tools/testing/selftests TARGETS=bpf SKIP_TARGETS=""'

The command generates untracked files and directories with make version less than 4.4:
'''
Untracked files:
(use "git add <file>..." to include in what will be committed)
tools/testing/selftests/bpfFEATURE-DUMP.selftests tools/testing/selftests/bpffeature/
'''
We lost slash after word "bpf".

Quoted 1 line

[...]

Here is the summary with links:
- [bpf-next,v2] selftests/bpf: avoid generating untracked files when running bpf selftests

    https://git.kernel.org/bpf/bpf-next/c/73b9075f334f

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html