diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-03-26 17:43:42 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-03-26 17:43:42 -0400 |
| commit | 0e536e2516296c93a45933f540de587b4597681a (patch) | |
| tree | 988a08b470ca4d769ae6ae3417af6c1efea3b709 /tools | |
| parent | d6702d840c0e34b0ef8b2a1932a762724db96c79 (diff) | |
| parent | 67d8712dcc70aa16d8e14a52eb73870e3cbddfc2 (diff) | |
Merge tag 'linux-kselftest-4.0-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest
Pull kselftest fix from Shuah Khan.
* tag 'linux-kselftest-4.0-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest:
selftests: Fix build failures when invoked from kselftest target
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/testing/selftests/Makefile | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/tools/testing/selftests/Makefile b/tools/testing/selftests/Makefile index 4e511221a0c1..0db571340edb 100644 --- a/tools/testing/selftests/Makefile +++ b/tools/testing/selftests/Makefile | |||
| @@ -22,6 +22,14 @@ TARGETS += vm | |||
| 22 | TARGETS_HOTPLUG = cpu-hotplug | 22 | TARGETS_HOTPLUG = cpu-hotplug |
| 23 | TARGETS_HOTPLUG += memory-hotplug | 23 | TARGETS_HOTPLUG += memory-hotplug |
| 24 | 24 | ||
| 25 | # Clear LDFLAGS and MAKEFLAGS if called from main | ||
| 26 | # Makefile to avoid test build failures when test | ||
| 27 | # Makefile doesn't have explicit build rules. | ||
| 28 | ifeq (1,$(MAKELEVEL)) | ||
| 29 | undefine LDFLAGS | ||
| 30 | override MAKEFLAGS = | ||
| 31 | endif | ||
| 32 | |||
| 25 | all: | 33 | all: |
| 26 | for TARGET in $(TARGETS); do \ | 34 | for TARGET in $(TARGETS); do \ |
| 27 | make -C $$TARGET; \ | 35 | make -C $$TARGET; \ |