From owner-svn-src-projects@freebsd.org Wed Feb 20 00:12:25 2019 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BB66D14DED51 for ; Wed, 20 Feb 2019 00:12:25 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 595BF832CE; Wed, 20 Feb 2019 00:12:25 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4CA14255DB; Wed, 20 Feb 2019 00:12:25 +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 x1K0CPEv001307; Wed, 20 Feb 2019 00:12:25 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x1K0CPJc001306; Wed, 20 Feb 2019 00:12:25 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201902200012.x1K0CPJc001306@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Enji Cooper Date: Wed, 20 Feb 2019 00:12:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r344322 - projects/import-googletest-1.8.1/share/mk X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: projects/import-googletest-1.8.1/share/mk X-SVN-Commit-Revision: 344322 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 595BF832CE X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.97)[-0.967,0]; NEURAL_HAM_LONG(-1.00)[-0.999,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Feb 2019 00:12:25 -0000 Author: ngie Date: Wed Feb 20 00:12:24 2019 New Revision: 344322 URL: https://svnweb.freebsd.org/changeset/base/344322 Log: MK_GOOGLETEST should be enabled/disabled based on MK_TESTS_SUPPORT Making MK_GOOGLETEST rely on MK_TESTS makes it impossible to rely on in buildworld, which is not desirable for items like `cddl/usr.sbin/zfsd/tests`. Modified: projects/import-googletest-1.8.1/share/mk/src.opts.mk Modified: projects/import-googletest-1.8.1/share/mk/src.opts.mk ============================================================================== --- projects/import-googletest-1.8.1/share/mk/src.opts.mk Wed Feb 20 00:10:56 2019 (r344321) +++ projects/import-googletest-1.8.1/share/mk/src.opts.mk Wed Feb 20 00:12:24 2019 (r344322) @@ -507,6 +507,9 @@ MK_FREEBSD_UPDATE:= no .if ${MK_TESTS} == "no" MK_DTRACE_TESTS:= no +.endif + +.if ${MK_TESTS_SUPPORT} == "no" MK_GOOGLETEST:= no .endif