History

Revert "selftests: Fix O= and KBUILD_OUTPUT handling for relative paths"

This reverts commit 303e6218ecec475d5bc3e5922dec770ee5baf107. 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.

Shuah Khan committed 6 years ago

Commit f60b85e1 parent ed2d8fa1 file · +2 −3Browse files

Unified · Split

tools/testing/selftests/Makefile+2−3
@@ -86,10 +86,10 @@ override LDFLAGS = · 85 unmodified lines
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 · 6 unmodified lines
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

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t