Skip to content

Commit e30dbe5

Browse files
committed
Merge tag 'linux-kselftest-5.5-rc1-fixes2' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest
Pull more kselftest fixes from Shuah Khan: "This second Kselftest fixes update for Linux 5.5-rc1 consists of an urgent revert to fix regression in CI coverage" * tag 'linux-kselftest-5.5-rc1-fixes2' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest: Revert "selftests: Fix O= and KBUILD_OUTPUT handling for relative paths"
2 parents 483847a + f60b85e commit e30dbe5

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
@@ -88,10 +88,10 @@ override LDFLAGS =
8888
endif
8989

9090
ifneq ($(O),)
91-
BUILD := $(abs_objtree)
91+
BUILD := $(O)
9292
else
9393
ifneq ($(KBUILD_OUTPUT),)
94-
BUILD := $(abs_objtree)/kselftest
94+
BUILD := $(KBUILD_OUTPUT)/kselftest
9595
else
9696
BUILD := $(shell pwd)
9797
DEFAULT_INSTALL_HDR_PATH := 1
@@ -104,7 +104,6 @@ include $(top_srcdir)/scripts/subarch.include
104104
ARCH ?= $(SUBARCH)
105105
export KSFT_KHDR_INSTALL_DONE := 1
106106
export BUILD
107-
#$(info abd_objtree = $(abs_objtree) BUILD = $(BUILD))
108107

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

0 commit comments

Comments
 (0)