diff options
author | Ingo Molnar <mingo@kernel.org> | 2015-04-02 13:22:35 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2015-04-02 13:22:35 +0200 |
commit | 223aa646d5aa6096230a9481e4c6c9cb67cfc4a6 (patch) | |
tree | 3e9013b2d6a099fabf4c5148dd9e522e04f8f073 /tools | |
parent | Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/... (diff) | |
parent | perf: Add per event clockid support (diff) | |
download | linux-223aa646d5aa6096230a9481e4c6c9cb67cfc4a6.tar.xz linux-223aa646d5aa6096230a9481e4c6c9cb67cfc4a6.zip |
Merge branch 'perf/timer' into perf/core
This WIP branch is now ready to be merged.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
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 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; \ |