diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-03-03 13:13:12 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-03-03 13:13:12 -0500 |
| commit | 78769912f680fc0a79a67e798a0ae76f07e63a7b (patch) | |
| tree | 437800d881708253f541ec743ea7185c9439df42 | |
| parent | c82be9d2244aacea9851c86f4fb74694c99cd874 (diff) | |
| parent | e53aff45c490ea04aa5d9e3cffa65b6b54397455 (diff) | |
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
| -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 @@ | |||
| 2 | # Makefile can operate with or without the kbuild infrastructure. | 2 | # Makefile can operate with or without the kbuild infrastructure. |
| 3 | CC := $(CROSS_COMPILE)gcc | 3 | CC := $(CROSS_COMPILE)gcc |
| 4 | 4 | ||
| 5 | ifeq (0,$(MAKELEVEL)) | ||
| 6 | OUTPUT := $(shell pwd) | ||
| 7 | endif | ||
| 8 | |||
| 5 | TEST_GEN_PROGS := $(patsubst %,$(OUTPUT)/%,$(TEST_GEN_PROGS)) | 9 | TEST_GEN_PROGS := $(patsubst %,$(OUTPUT)/%,$(TEST_GEN_PROGS)) |
| 6 | TEST_GEN_FILES := $(patsubst %,$(OUTPUT)/%,$(TEST_GEN_FILES)) | 10 | TEST_GEN_FILES := $(patsubst %,$(OUTPUT)/%,$(TEST_GEN_FILES)) |
| 7 | 11 | ||