From owner-svn-src-projects@freebsd.org Mon Mar 11 19:50:45 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 A41D4152C530 for ; Mon, 11 Mar 2019 19:50:45 +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 41F4380017; Mon, 11 Mar 2019 19:50:45 +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 28507F7C6; Mon, 11 Mar 2019 19:50:45 +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 x2BJoiVf075694; Mon, 11 Mar 2019 19:50:44 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x2BJoinp075691; Mon, 11 Mar 2019 19:50:44 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201903111950.x2BJoinp075691@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Enji Cooper Date: Mon, 11 Mar 2019 19:50:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r345023 - in projects/import-googletest-1.8.1: etc/mtree share/examples/tests/tests share/examples/tests/tests/googletest X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: in projects/import-googletest-1.8.1: etc/mtree share/examples/tests/tests share/examples/tests/tests/googletest X-SVN-Commit-Revision: 345023 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 41F4380017 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.997,0]; NEURAL_HAM_SHORT(-0.97)[-0.967,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] 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: Mon, 11 Mar 2019 19:50:45 -0000 Author: ngie Date: Mon Mar 11 19:50:44 2019 New Revision: 345023 URL: https://svnweb.freebsd.org/changeset/base/345023 Log: Compile and install most of the googletest examples sample9_unittest is not compiled/installed, because it intentionally fails and would result in red test runs until broken to always pass. Added: projects/import-googletest-1.8.1/share/examples/tests/tests/googletest/ projects/import-googletest-1.8.1/share/examples/tests/tests/googletest/Makefile (contents, props changed) Modified: projects/import-googletest-1.8.1/etc/mtree/BSD.tests.dist projects/import-googletest-1.8.1/share/examples/tests/tests/Makefile Modified: projects/import-googletest-1.8.1/etc/mtree/BSD.tests.dist ============================================================================== --- projects/import-googletest-1.8.1/etc/mtree/BSD.tests.dist Mon Mar 11 19:46:15 2019 (r345022) +++ projects/import-googletest-1.8.1/etc/mtree/BSD.tests.dist Mon Mar 11 19:50:44 2019 (r345023) @@ -440,6 +440,8 @@ tests atf .. + googletest + .. plain .. tap Modified: projects/import-googletest-1.8.1/share/examples/tests/tests/Makefile ============================================================================== --- projects/import-googletest-1.8.1/share/examples/tests/tests/Makefile Mon Mar 11 19:46:15 2019 (r345022) +++ projects/import-googletest-1.8.1/share/examples/tests/tests/Makefile Mon Mar 11 19:50:44 2019 (r345023) @@ -1,5 +1,7 @@ # $FreeBSD$ +.include + # Directory into which the Kyuafile provided by this directory will be # installed. # @@ -20,6 +22,10 @@ TESTS_SUBDIRS+= atf TESTS_SUBDIRS+= plain TESTS_SUBDIRS+= tap + +.if ${MK_GOOGLETEST} != no +TESTS_SUBDIRS+= googletest +.endif # We leave KYUAFILE unset so that bsd.test.mk auto-generates a Kyuafile # for us based on the contents of the TESTS_SUBDIRS line above. The Added: projects/import-googletest-1.8.1/share/examples/tests/tests/googletest/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/import-googletest-1.8.1/share/examples/tests/tests/googletest/Makefile Mon Mar 11 19:50:44 2019 (r345023) @@ -0,0 +1,36 @@ +# $FreeBSD$ + +.PATH: ${SRCTOP}/contrib/googletest/googletest/samples + +GTEST_MAIN_REQ_TESTS+= sample1_unittest +GTEST_MAIN_REQ_TESTS+= sample2_unittest +GTEST_MAIN_REQ_TESTS+= sample3_unittest +GTEST_MAIN_REQ_TESTS+= sample4_unittest +GTEST_MAIN_REQ_TESTS+= sample5_unittest +GTEST_MAIN_REQ_TESTS+= sample6_unittest +GTEST_MAIN_REQ_TESTS+= sample7_unittest +GTEST_MAIN_REQ_TESTS+= sample8_unittest + +# sample9_unittest's `CustomOutputTest.Fails` fails intentionally to illustrate +# how output format can be adjusted with command-line parameters. +#GTEST_REQ_TESTS+= sample9_unittest +GTEST_REQ_TESTS+= sample10_unittest + +.for t in ${GTEST_MAIN_REQ_TESTS} +GTESTS+= $t +LIBADD.$t+= gtest_main +SRCS.$t+= $t.cc +.endfor + +.for t in ${GTEST_REQ_TESTS} +GTESTS+= $t +LIBADD.$t+= gtest +SRCS.$t+= $t.cc +.endfor + +SRCS.sample1_unittest+= sample1.cc +SRCS.sample2_unittest+= sample2.cc +SRCS.sample4_unittest+= sample4.cc +SRCS.sample5_unittest+= sample1.cc + +.include