summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2008-04-24 15:35:17 +1000
committerStephen Rothwell <sfr@canb.auug.org.au>2008-04-24 15:35:17 +1000
commit6296201860e1671169e5c56eb42919e31f93736f (patch)
tree065774eb484b55eb55c828ff3f2554e9e02c9953 /Makefile
parent11d045361f3d4aefa411a97bcfe5b6618faf30c1 (diff)
parent1caff9ba52970a3492bfe8a1b9e26291d34259c5 (diff)
Merge commit 'tests/master'
Conflicts: lib/Kconfig.debug
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 4927fde62af8..f737ed91e0be 100644
--- a/Makefile
+++ b/Makefile
@@ -608,6 +608,7 @@ export mod_strip_cmd
ifeq ($(KBUILD_EXTMOD),)
core-y += kernel/ mm/ fs/ ipc/ security/ crypto/ block/
+core-$(CONFIG_KERNEL_TESTS) += tests/
vmlinux-dirs := $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \
$(core-y) $(core-m) $(drivers-y) $(drivers-m) \