diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2017-03-03 10:13:12 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-03-03 10:13:12 -0800 |
| commit | 78769912f680fc0a79a67e798a0ae76f07e63a7b (patch) | |
| tree | 437800d881708253f541ec743ea7185c9439df42 /tools/testing/selftests | |
| parent | Merge tag 'pm-turbostat-4.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm (diff) | |
| parent | selftests: lib.mk Fix individual test builds (diff) | |
| download | linux-dev-78769912f680fc0a79a67e798a0ae76f07e63a7b.tar.xz linux-dev-78769912f680fc0a79a67e798a0ae76f07e63a7b.zip | |
Merge tag 'linux-kselftest-4.11-rc1-urgent_fix' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest
Pull kselftest fix from Shuah Khan:
"This update consists of an urgent fix for individual test build
failures introduced in the 4.11-rc1 update"
* tag 'linux-kselftest-4.11-rc1-urgent_fix' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest:
selftests: lib.mk Fix individual test builds
Diffstat (limited to 'tools/testing/selftests')
| -rw-r--r-- | tools/testing/selftests/lib.mk | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tools/testing/selftests/lib.mk b/tools/testing/selftests/lib.mk index ce96d80ad64f..775c589ac3c0 100644 --- a/tools/testing/selftests/lib.mk +++ b/tools/testing/selftests/lib.mk @@ -2,6 +2,10 @@ # Makefile can operate with or without the kbuild infrastructure. CC := $(CROSS_COMPILE)gcc +ifeq (0,$(MAKELEVEL)) +OUTPUT := $(shell pwd) +endif + TEST_GEN_PROGS := $(patsubst %,$(OUTPUT)/%,$(TEST_GEN_PROGS)) TEST_GEN_FILES := $(patsubst %,$(OUTPUT)/%,$(TEST_GEN_FILES)) |