diff options
| author | ngie <ngie@FreeBSD.org> | 2017-05-30 03:02:07 +0000 |
|---|---|---|
| committer | ngie <ngie@FreeBSD.org> | 2017-05-30 03:02:07 +0000 |
| commit | bbaf5408419253e74bbcb75aad70ef507cb8bec7 (patch) | |
| tree | 00065cb32cace1079eb0f42dd73a56db31705bb5 | |
| parent | 252dcfdd87a44cf31a539fdaaaf391f454166575 (diff) | |
| download | FreeBSD-src-bbaf5408419253e74bbcb75aad70ef507cb8bec7.zip FreeBSD-src-bbaf5408419253e74bbcb75aad70ef507cb8bec7.tar.gz | |
MFC r318007,r318008,r318009,r318011:
r318007:
Add intermediary Makefile for compiling all items in the directory
r318008:
Only compile tests/ if MK_TESTS != no or ALL_MODULES is defined
r318009:
Add MK_TESTS to kern.opts.mk to support r31800
MFC with: r318008
Pointyhat to: ngie
r318011:
Mark this Makefile SUBDIR_PARALLEL
I inserted the necessary SUBDIR+= .WAIT in the previous commit
| -rw-r--r-- | sys/conf/kern.opts.mk | 1 | ||||
| -rw-r--r-- | sys/modules/Makefile | 6 | ||||
| -rw-r--r-- | sys/modules/tests/Makefile | 9 |
3 files changed, 14 insertions, 2 deletions
diff --git a/sys/conf/kern.opts.mk b/sys/conf/kern.opts.mk index 81d16df..0843f7f 100644 --- a/sys/conf/kern.opts.mk +++ b/sys/conf/kern.opts.mk @@ -41,6 +41,7 @@ __DEFAULT_YES_OPTIONS = \ PF \ SOURCELESS_HOST \ SOURCELESS_UCODE \ + TESTS \ USB_GADGET_EXAMPLES \ ZFS diff --git a/sys/modules/Makefile b/sys/modules/Makefile index cae12a0..22f4974 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -368,8 +368,6 @@ SUBDIR= \ ${_ti} \ ${_tcp_fastpath} \ ${_tcpmd5} \ - tests/framework \ - tests/callout_test \ tl \ tmpfs \ ${_toecore} \ @@ -536,6 +534,10 @@ _txp= txp _cxgbe= cxgbe .endif +.if ${MK_TESTS} != "no" || defined(ALL_MODULES) +SUBDIR+= tests +.endif + .if ${MK_ZFS} != "no" || defined(ALL_MODULES) SUBDIR+= zfs .endif diff --git a/sys/modules/tests/Makefile b/sys/modules/tests/Makefile new file mode 100644 index 0000000..8b5bf36 --- /dev/null +++ b/sys/modules/tests/Makefile @@ -0,0 +1,9 @@ +# $FreeBSD$ + +SUBDIR+= framework +SUBDIR+= .WAIT +SUBDIR+= callout_test + +SUBDIR_PARALLEL= + +.include <bsd.subdir.mk> |
