Skip to content

Commit f60b85e

Browse files
committed
Revert "selftests: Fix O= and KBUILD_OUTPUT handling for relative paths"
This reverts commit 303e621. This patch breaks several CI use-cases that run kselftest builds without using main Makefile. This fix depends on abs_objtree which is undefined when kselftest build is invoked on selftests Makefile without going through the main Makefile. Revert this for now as this patch impacts selftest runs. Fixes: 303e621 ("selftests: Fix O= and KBUILD_OUTPUT handling for relative paths") Reported-by: Cristian Marussi <[email protected]> Reported-by: Michael Ellerman <[email protected]> Signed-off-by: Shuah Khan <[email protected]>
1 parent ed2d8fa commit f60b85e

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

tools/testing/selftests/Makefile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,10 +86,10 @@ override LDFLAGS =
8686
endif
8787

8888
ifneq ($(O),)
89-
BUILD := $(abs_objtree)
89+
BUILD := $(O)
9090
else
9191
ifneq ($(KBUILD_OUTPUT),)
92-
BUILD := $(abs_objtree)/kselftest
92+
BUILD := $(KBUILD_OUTPUT)/kselftest
9393
else
9494
BUILD := $(shell pwd)
9595
DEFAULT_INSTALL_HDR_PATH := 1
@@ -102,7 +102,6 @@ include $(top_srcdir)/scripts/subarch.include
102102
ARCH ?= $(SUBARCH)
103103
export KSFT_KHDR_INSTALL_DONE := 1
104104
export BUILD
105-
#$(info abd_objtree = $(abs_objtree) BUILD = $(BUILD))
106105

107106
# build and run gpio when output directory is the src dir.
108107
# gpio has dependency on tools/gpio and builds tools/gpio

0 commit comments

Comments
 (0)