svn commit: r319171 - in stable/11/sys: conf modules modules/tests

[Ngie Cooper]

Author: ngie
Date: Tue May 30 03:02:07 2017
New Revision: 319171
URL: https://svnweb.freebsd.org/changeset/base/319171

Log:
  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

Added:
  stable/11/sys/modules/tests/Makefile
     - copied, changed from r318007, head/sys/modules/tests/Makefile
Modified:
  stable/11/sys/conf/kern.opts.mk
  stable/11/sys/modules/Makefile
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/conf/kern.opts.mk
==============================================================================
--- stable/11/sys/conf/kern.opts.mk	Tue May 30 02:56:37 2017	(r319170)
+++ stable/11/sys/conf/kern.opts.mk	Tue May 30 03:02:07 2017	(r319171)
@@ -41,6 +41,7 @@ __DEFAULT_YES_OPTIONS = \
     PF \
     SOURCELESS_HOST \
     SOURCELESS_UCODE \
+    TESTS \
     USB_GADGET_EXAMPLES \
     ZFS
 

Modified: stable/11/sys/modules/Makefile
==============================================================================
--- stable/11/sys/modules/Makefile	Tue May 30 02:56:37 2017	(r319170)
+++ stable/11/sys/modules/Makefile	Tue May 30 03:02:07 2017	(r319171)
@@ -368,8 +368,6 @@ SUBDIR=	\
 	${_ti} \
 	${_tcp_fastpath} \
 	${_tcpmd5} \
-	tests/framework \
-	tests/callout_test \
 	tl \
 	tmpfs \
 	${_toecore} \
@@ -534,6 +532,10 @@ _txp=		txp
 	${MACHINE_ARCH:C/mips(el)?/mips/} != "mips" && \
 	${MACHINE_ARCH} != "powerpc" && ${MACHINE_CPUARCH} != "riscv"
 _cxgbe=		cxgbe
+.endif
+
+.if ${MK_TESTS} != "no" || defined(ALL_MODULES)
+SUBDIR+=	tests
 .endif
 
 .if ${MK_ZFS} != "no" || defined(ALL_MODULES)

Copied and modified: stable/11/sys/modules/tests/Makefile (from r318007, head/sys/modules/tests/Makefile)
==============================================================================
--- head/sys/modules/tests/Makefile	Tue May  9 04:56:14 2017	(r318007, copy source)
+++ stable/11/sys/modules/tests/Makefile	Tue May 30 03:02:07 2017	(r319171)
@@ -4,4 +4,6 @@ SUBDIR+=	framework
 SUBDIR+=	.WAIT
 SUBDIR+=	callout_test
 
+SUBDIR_PARALLEL=
+
 .include <bsd.subdir.mk>