Skip to content

Commit f69237e

Browse files
gthelenshuahkh
authored andcommitted
selftests: more general make nesting support
selftests can be built from the toplevel kernel makefile (e.g. make kselftest-all) or directly (make -C tools/testing/selftests all). The toplevel kernel makefile explicitly disables implicit rules with "MAKEFLAGS += -rR", which is passed to tools/testing/selftests. Some selftest makefiles require implicit make rules, which is why commit 67d8712 ("selftests: Fix build failures when invoked from kselftest target") reenables implicit rules by clearing MAKEFLAGS if MAKELEVEL=1. So far so good. However, if the toplevel makefile is called from an outer makefile then MAKELEVEL will be elevated, which breaks the MAKELEVEL equality test. Example wrapped makefile error: $ cat ~/Makefile all: $(MAKE) defconfig $(MAKE) kselftest-all $ make -sf ~/Makefile futex_wait_timeout.c /src/tools/testing/selftests/kselftest_harness.h /src/tools/testing/selftests/kselftest.h ../include/futextest.h ../include/atomic.h ../include/logging.h -lpthread -lrt -o /src/tools/testing/selftests/futex/functional/futex_wait_timeout make[4]: futex_wait_timeout.c: Command not found Rather than checking $(MAKELEVEL), check for $(LINK.c), which is a more direct side effect of "make -R". This enables arbitrary makefile nesting. Signed-off-by: Greg Thelen <gthelen@google.com> Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>
1 parent 75fa677 commit f69237e

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

tools/testing/selftests/Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,10 +88,10 @@ endif
8888
# of the targets gets built.
8989
FORCE_TARGETS ?=
9090

91-
# Clear LDFLAGS and MAKEFLAGS if called from main
92-
# Makefile to avoid test build failures when test
93-
# Makefile doesn't have explicit build rules.
94-
ifeq (1,$(MAKELEVEL))
91+
# Clear LDFLAGS and MAKEFLAGS when implicit rules are missing. This provides
92+
# implicit rules to sub-test Makefiles which avoids build failures in test
93+
# Makefile that don't have explicit build rules.
94+
ifeq (,$(LINK.c))
9595
override LDFLAGS =
9696
override MAKEFLAGS =
9797
endif

0 commit comments

Comments
 (0)