Skip to content

Commit 0ac33e4

Browse files
iii-ishuahkh
authored andcommitted
selftests: use "$(MAKE)" instead of "make"
When doing "make kselftest TARGETS=bpf -j12", bpf progs end up being compiled sequentially and thus slowly. The reason is that parent make (tools/testing/selftests/Makefile) does not share its jobserver with child make (tools/testing/selftests/bpf/Makefile), therefore the latter runs with -j1. Change all instances of "make" to "$(MAKE)", so that the whole make hierarchy runs using a single jobserver. Signed-off-by: Ilya Leoshkevich <[email protected]> Signed-off-by: Shuah Khan <[email protected]>
1 parent d1abaeb commit 0ac33e4

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

tools/testing/selftests/Makefile

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -126,45 +126,45 @@ endif
126126
# in the default INSTALL_HDR_PATH usr/include.
127127
khdr:
128128
ifeq (1,$(DEFAULT_INSTALL_HDR_PATH))
129-
make --no-builtin-rules ARCH=$(ARCH) -C $(top_srcdir) headers_install
129+
$(MAKE) --no-builtin-rules ARCH=$(ARCH) -C $(top_srcdir) headers_install
130130
else
131-
make --no-builtin-rules INSTALL_HDR_PATH=$$BUILD/usr \
131+
$(MAKE) --no-builtin-rules INSTALL_HDR_PATH=$$BUILD/usr \
132132
ARCH=$(ARCH) -C $(top_srcdir) headers_install
133133
endif
134134

135135
all: khdr
136136
@for TARGET in $(TARGETS); do \
137137
BUILD_TARGET=$$BUILD/$$TARGET; \
138138
mkdir $$BUILD_TARGET -p; \
139-
make OUTPUT=$$BUILD_TARGET -C $$TARGET;\
139+
$(MAKE) OUTPUT=$$BUILD_TARGET -C $$TARGET;\
140140
done;
141141

142142
run_tests: all
143143
@for TARGET in $(TARGETS); do \
144144
BUILD_TARGET=$$BUILD/$$TARGET; \
145-
make OUTPUT=$$BUILD_TARGET -C $$TARGET run_tests;\
145+
$(MAKE) OUTPUT=$$BUILD_TARGET -C $$TARGET run_tests;\
146146
done;
147147

148148
hotplug:
149149
@for TARGET in $(TARGETS_HOTPLUG); do \
150150
BUILD_TARGET=$$BUILD/$$TARGET; \
151-
make OUTPUT=$$BUILD_TARGET -C $$TARGET;\
151+
$(MAKE) OUTPUT=$$BUILD_TARGET -C $$TARGET;\
152152
done;
153153

154154
run_hotplug: hotplug
155155
@for TARGET in $(TARGETS_HOTPLUG); do \
156156
BUILD_TARGET=$$BUILD/$$TARGET; \
157-
make OUTPUT=$$BUILD_TARGET -C $$TARGET run_full_test;\
157+
$(MAKE) OUTPUT=$$BUILD_TARGET -C $$TARGET run_full_test;\
158158
done;
159159

160160
clean_hotplug:
161161
@for TARGET in $(TARGETS_HOTPLUG); do \
162162
BUILD_TARGET=$$BUILD/$$TARGET; \
163-
make OUTPUT=$$BUILD_TARGET -C $$TARGET clean;\
163+
$(MAKE) OUTPUT=$$BUILD_TARGET -C $$TARGET clean;\
164164
done;
165165

166166
run_pstore_crash:
167-
make -C pstore run_crash
167+
$(MAKE) -C pstore run_crash
168168

169169
# Use $BUILD as the default install root. $BUILD points to the
170170
# right output location for the following cases:
@@ -184,7 +184,7 @@ ifdef INSTALL_PATH
184184
install -m 744 kselftest/prefix.pl $(INSTALL_PATH)/kselftest/
185185
@for TARGET in $(TARGETS); do \
186186
BUILD_TARGET=$$BUILD/$$TARGET; \
187-
make OUTPUT=$$BUILD_TARGET -C $$TARGET INSTALL_PATH=$(INSTALL_PATH)/$$TARGET install; \
187+
$(MAKE) OUTPUT=$$BUILD_TARGET -C $$TARGET INSTALL_PATH=$(INSTALL_PATH)/$$TARGET install; \
188188
done;
189189

190190
@# Ask all targets to emit their test scripts
@@ -203,7 +203,7 @@ ifdef INSTALL_PATH
203203
echo "[ -w /dev/kmsg ] && echo \"kselftest: Running tests in $$TARGET\" >> /dev/kmsg" >> $(ALL_SCRIPT); \
204204
echo "cd $$TARGET" >> $(ALL_SCRIPT); \
205205
echo -n "run_many" >> $(ALL_SCRIPT); \
206-
make -s --no-print-directory OUTPUT=$$BUILD_TARGET -C $$TARGET emit_tests >> $(ALL_SCRIPT); \
206+
$(MAKE) -s --no-print-directory OUTPUT=$$BUILD_TARGET -C $$TARGET emit_tests >> $(ALL_SCRIPT); \
207207
echo "" >> $(ALL_SCRIPT); \
208208
echo "cd \$$ROOT" >> $(ALL_SCRIPT); \
209209
done;
@@ -216,7 +216,7 @@ endif
216216
clean:
217217
@for TARGET in $(TARGETS); do \
218218
BUILD_TARGET=$$BUILD/$$TARGET; \
219-
make OUTPUT=$$BUILD_TARGET -C $$TARGET clean;\
219+
$(MAKE) OUTPUT=$$BUILD_TARGET -C $$TARGET clean;\
220220
done;
221221

222222
.PHONY: khdr all run_tests hotplug run_hotplug clean_hotplug run_pstore_crash install clean

0 commit comments

Comments
 (0)