diff options
author | Takashi Iwai <tiwai@suse.de> | 2015-04-08 11:29:56 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2015-04-08 11:30:49 +0200 |
commit | 0a599838737a2527c35e4d94f794aefe59df1781 (patch) | |
tree | b1f7571949527c459ca5e27bd420518e905c8b27 /tools | |
parent | 2d846c74027231264e57e4e34faf9576394e3ce0 (diff) | |
parent | a59d7199f62b8336570972dcc288321d0ec999fe (diff) | |
download | blackbird-op-linux-0a599838737a2527c35e4d94f794aefe59df1781.tar.gz blackbird-op-linux-0a599838737a2527c35e4d94f794aefe59df1781.zip |
Merge branch 'for-linus' into for-next
Back merge HD-audio quirks to for-next branch, so that we can apply
a couple of more quirks.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
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; \ |