diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-12-02 17:29:25 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-12-02 17:29:25 -0800 |
| commit | e30dbe50dc91d25dde251169b66d39f99bf45bad (patch) | |
| tree | a626d6c830d3277e99512cfb311b30f1d00b7ae0 /tools | |
| parent | 483847a70262f7361f8a6f78513c985c2c8b1719 (diff) | |
| parent | f60b85e83659b5fbd3eb2c8f68d33ef4e35ebb2c (diff) | |
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"
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/testing/selftests/Makefile | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/tools/testing/selftests/Makefile b/tools/testing/selftests/Makefile index 0fb95f25944d..d67f968eac21 100644 --- a/tools/testing/selftests/Makefile +++ b/tools/testing/selftests/Makefile @@ -88,10 +88,10 @@ override LDFLAGS = endif ifneq ($(O),) - BUILD := $(abs_objtree) + BUILD := $(O) else ifneq ($(KBUILD_OUTPUT),) - BUILD := $(abs_objtree)/kselftest + BUILD := $(KBUILD_OUTPUT)/kselftest else BUILD := $(shell pwd) DEFAULT_INSTALL_HDR_PATH := 1 @@ -104,7 +104,6 @@ include $(top_srcdir)/scripts/subarch.include ARCH ?= $(SUBARCH) export KSFT_KHDR_INSTALL_DONE := 1 export BUILD -#$(info abd_objtree = $(abs_objtree) BUILD = $(BUILD)) # build and run gpio when output directory is the src dir. # gpio has dependency on tools/gpio and builds tools/gpio |