aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-03-26 14:43:42 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2015-03-26 14:43:42 -0700
commit0e536e2516296c93a45933f540de587b4597681a (patch)
tree988a08b470ca4d769ae6ae3417af6c1efea3b709
parentd6702d840c0e34b0ef8b2a1932a762724db96c79 (diff)
parent67d8712dcc70aa16d8e14a52eb73870e3cbddfc2 (diff)
downloadlinux-0e536e2516296c93a45933f540de587b4597681a.tar.gz
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
-rw-r--r--tools/testing/selftests/Makefile8
1 files changed, 8 insertions, 0 deletions
diff --git a/tools/testing/selftests/Makefile b/tools/testing/selftests/Makefile
index 4e511221a0c..0db571340ed 100644
--- a/tools/testing/selftests/Makefile
+++ b/tools/testing/selftests/Makefile
@@ -22,6 +22,14 @@ TARGETS += vm
TARGETS_HOTPLUG = cpu-hotplug
TARGETS_HOTPLUG += memory-hotplug
+# Clear LDFLAGS and MAKEFLAGS if called from main
+# Makefile to avoid test build failures when test
+# Makefile doesn't have explicit build rules.
+ifeq (1,$(MAKELEVEL))
+undefine LDFLAGS
+override MAKEFLAGS =
+endif
+
all:
for TARGET in $(TARGETS); do \
make -C $$TARGET; \