From owner-svn-src-all@freebsd.org Tue May 30 03:02:09 2017 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2810AAF85B5; Tue, 30 May 2017 03:02:09 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E7AF473209; Tue, 30 May 2017 03:02:08 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v4U3280O050495; Tue, 30 May 2017 03:02:08 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v4U32752050478; Tue, 30 May 2017 03:02:07 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201705300302.v4U32752050478@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper Date: Tue, 30 May 2017 03:02:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r319171 - in stable/11/sys: conf modules modules/tests X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 May 2017 03:02:09 -0000 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