selftests: more general make nesting support
PATCH 1/1 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 67d8712dcc70 ("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 foundRather than checking $(MAKELEVEL), check for $(LINK.c), which is a more direct side effect of "make -R". This enables arbitrary makefile nesting.
--- tools/testing/selftests/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
tools/testing/selftests/Makefile +4 -4
@@ -84,10 +84,10 @@ endif # of the targets gets built. FORCE_TARGETS ?= -# Clear LDFLAGS and MAKEFLAGS if called from main -# Makefile to avoid test build failures when test -# Makefile doesn't have explicit build rules. -ifeq (1,$(MAKELEVEL)) +# Clear LDFLAGS and MAKEFLAGS when implicit rules are missing. This provides +# implicit rules to sub-test Makefiles which avoids build failures in test +# Makefile that don't have explicit build rules. +ifeq (,$(LINK.c)) override LDFLAGS = override MAKEFLAGS = endif
Signature · 1 line
2.28.0.rc0.142.g3c755180ce-goog
Quoted 52 lines · Greg Thelen
selftests can be built from the toplevel kernel makefile (e.g. make kselftest-all) or directly (make -C
tools/testing/selftestsall).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 commit67d8712dcc70("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 foundRather 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 <[email protected]>--- tools/testing/selftests/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)tools/testing/selftests/Makefile +4
-5@@ -84,10 +84,10 @@ endif # of the targets gets built. FORCE_TARGETS ?= -# Clear LDFLAGS and MAKEFLAGS if called from main -# Makefile to avoid test build failures when test -# Makefile doesn't have explicit build rules. -ifeq (1,$(MAKELEVEL)) +# Clear LDFLAGS and MAKEFLAGS when implicit rules are missing. This provides +# implicit rules to sub-test Makefiles which avoids build failures in test +# Makefile that don't have explicit build rules. +ifeq (,$(LINK.c)) override LDFLAGS = override MAKEFLAGS = endif --
Quoted 1 line
2.28.0.rc0.142.g3c755180ce-goog
Is there any feedback on this patch? It's not high priority but something that will help me make more use of selftests.
Shuah Khan
maintainerQuoted 41 lines · Greg Thelen
Quoted 40 lines · Greg Thelen
selftests can be built from the toplevel kernel makefile (e.g. make kselftest-all) or directly (make -C
tools/testing/selftestsall).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 commit67d8712dcc70("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 foundRather 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 <[email protected]>--- tools/testing/selftests/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)tools/testing/selftests/Makefile +0
-0@@ -84,10 +84,10 @@ endif # of the targets gets built. FORCE_TARGETS ?=
Quoted 17 lines
Quoted 12 lines
tools/testing/selftests/Makefile +4
-5-# Clear LDFLAGS and MAKEFLAGS if called from main -# Makefile to avoid test build failures when test -# Makefile doesn't have explicit build rules. -ifeq (1,$(MAKELEVEL)) +# Clear LDFLAGS and MAKEFLAGS when implicit rules are missing. This provides +# implicit rules to sub-test Makefiles which avoids build failures in test +# Makefile that don't have explicit build rules. +ifeq (,$(LINK.c)) override LDFLAGS = override MAKEFLAGS = endif --Quoted 1 line
2.28.0.rc0.142.g3c755180ce-goog
Is there any feedback on this patch? It's not high priority but something that will help me make more use of selftests.
No issues with the patch. I will apply it once the merge window ends.
thanks,
-- Shuah
Quoted 60 lines · Shuah Khan
Quoted 41 lines · Greg Thelen
Quoted 40 lines · Greg Thelen
selftests can be built from the toplevel kernel makefile (e.g. make kselftest-all) or directly (make -C
tools/testing/selftestsall).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 commit67d8712dcc70("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 foundRather 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 <[email protected]>--- tools/testing/selftests/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)tools/testing/selftests/Makefile +0
-0@@ -84,10 +84,10 @@ endif # of the targets gets built. FORCE_TARGETS ?=Quoted 17 lines
Quoted 12 lines
tools/testing/selftests/Makefile +4
-5-# Clear LDFLAGS and MAKEFLAGS if called from main -# Makefile to avoid test build failures when test -# Makefile doesn't have explicit build rules. -ifeq (1,$(MAKELEVEL)) +# Clear LDFLAGS and MAKEFLAGS when implicit rules are missing. This provides +# implicit rules to sub-test Makefiles which avoids build failures in test +# Makefile that don't have explicit build rules. +ifeq (,$(LINK.c)) override LDFLAGS = override MAKEFLAGS = endif --Quoted 1 line
2.28.0.rc0.142.g3c755180ce-goog
Is there any feedback on this patch? It's not high priority but something that will help me make more use of selftests.
Quoted 4 lines
No issues with the patch. I will apply it once the merge window ends.
thanks,
-- Shuah
Great. Thank you.