Merge tag 'linux-kselftest-5.5-rc1-fixes2' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

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"

Linus Torvalds 6 years ago e30dbe50 483847a7

+2 -3

1 changed file

expand all

tools

testing

selftests

Makefile

+2 -3

tools/testing/selftests/Makefile

··· 88 88 endif 89 89 90 90 ifneq ($(O),) 91 - BUILD := $(abs_objtree) 91 + BUILD := $(O) 92 92 else 93 93 ifneq ($(KBUILD_OUTPUT),) 94 - BUILD := $(abs_objtree)/kselftest 94 + BUILD := $(KBUILD_OUTPUT)/kselftest 95 95 else 96 96 BUILD := $(shell pwd) 97 97 DEFAULT_INSTALL_HDR_PATH := 1 ··· 104 104 ARCH ?= $(SUBARCH) 105 105 export KSFT_KHDR_INSTALL_DONE := 1 106 106 export BUILD 107 - #$(info abd_objtree = $(abs_objtree) BUILD = $(BUILD)) 108 107 109 108 # build and run gpio when output directory is the src dir. 110 109 # gpio has dependency on tools/gpio and builds tools/gpio