Date: Thu, 30 May 2019 20:07:08 -0700 From: Adrian Chadd <adrian.chadd@gmail.com> To: Enji Cooper <ngie@freebsd.org> Cc: src-committers <src-committers@freebsd.org>, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r345203 - in head: contrib/googletest contrib/mandoc etc/mtree lib lib/googletest share/examples/tests/tests share/examples/tests/tests/googletest share/mk tools/build/mk tools/build/op... Message-ID: <CAJ-VmonXDOFr9SEmOup=-Lht6W%2Bpt=6PTaa04izih3xLZNBhvw@mail.gmail.com> In-Reply-To: <201903152143.x2FLhrcK098439@repo.freebsd.org> References: <201903152143.x2FLhrcK098439@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
hi, I'm seeing build failures where things like zfs do not find gmock/gmock.h when building. Have you seen this? -a On Fri, 15 Mar 2019 at 14:44, Enji Cooper <ngie@freebsd.org> wrote: > > Author: ngie > Date: Fri Mar 15 21:43:52 2019 > New Revision: 345203 > URL: https://svnweb.freebsd.org/changeset/base/345203 > > Log: > Initial googlemock/googletest integration into the build/FreeBSD test suite > > This initial integration takes googlemock/googletest release 1.8.1, integrates > the library, tests, and sample unit tests into the build. > > googlemock/googletest's inclusion is optionally available via `MK_GOOGLETEST`. > `MK_GOOGLETEST` is dependent on `MK_TESTS` and is enabled by default when > built with a C++11 capable toolchain. > > Google tests can be specified via the `GTESTS` variable, which, in comparison > with the other test drivers, is more simplified/streamlined, as Googletest only > supports C++ tests; not raw C or shell tests (C tests can be written in C++ > using the standard embedding methods). > > No dependent libraries are assumed for the tests. One must specify `gmock`, > `gmock_main`, `gtest`, or `gtest_main`, via `LIBADD` for the program. > > More information about googlemock and googletest can be found on the > Googletest [project page](https://github.com/google/googletest), and the > [GoogleMock](https://github.com/google/googletest/blob/v1.8.x/googlemock/docs/Documentation.md) > and > [GoogleTest](https://github.com/google/googletest/tree/v1.8.x/googletest/docs) > docs. > > These tests are originally integrated into the build as plain driver tests, but > will be natively integrated into Kyua in a later version. > > Known issues/Errata: > * [WhenDynamicCastToTest.AmbiguousCast fails on FreeBSD](https://github.com/google/googletest/issues/2172) > > Reviewed by: asomers > Approved by: emaste (mentor) > MFC after: 2 months > Differential Revision: https://reviews.freebsd.org/D19551 > > Added: > head/contrib/googletest/ > - copied from r345031, projects/import-googletest-1.8.1/contrib/googletest/ > head/lib/googletest/ > - copied from r345031, projects/import-googletest-1.8.1/lib/googletest/ > head/share/examples/tests/tests/googletest/ > - copied from r345031, projects/import-googletest-1.8.1/share/examples/tests/tests/googletest/ > head/share/mk/googletest.test.inc.mk > - copied, changed from r345031, projects/import-googletest-1.8.1/share/mk/googletest.test.inc.mk > head/share/mk/googletest.test.mk > - copied unchanged from r345031, projects/import-googletest-1.8.1/share/mk/googletest.test.mk > head/tools/build/options/WITHOUT_GOOGLETEST > - copied, changed from r345031, projects/import-googletest-1.8.1/tools/build/options/WITHOUT_GOOGLETEST > Modified: > head/contrib/mandoc/lib.in > head/etc/mtree/BSD.tests.dist > head/etc/mtree/BSD.usr.dist > head/lib/Makefile > head/share/examples/tests/tests/Makefile > head/share/examples/tests/tests/googletest/Makefile > head/share/mk/Makefile > head/share/mk/bsd.README > head/share/mk/bsd.test.mk > head/share/mk/src.libnames.mk > head/share/mk/src.opts.mk > head/tools/build/mk/OptionalObsoleteFiles.inc > > Modified: head/contrib/mandoc/lib.in > ============================================================================== > --- head/contrib/mandoc/lib.in Fri Mar 15 21:11:47 2019 (r345202) > +++ head/contrib/mandoc/lib.in Fri Mar 15 21:43:52 2019 (r345203) > @@ -62,7 +62,9 @@ LINE("libfsid", "Filesystem Identification Library (l > LINE("libftpio", "FTP Connection Management Library (libftpio, \\-lftpio)") > LINE("libform", "Curses Form Library (libform, \\-lform)") > LINE("libgeom", "Userland API Library for Kernel GEOM subsystem (libgeom, \\-lgeom)") > +LINE("libgmock", "GoogleMock library (libgmock, \\-lgmock)") > LINE("libgpio", "General-Purpose Input Output (GPIO) library (libgpio, \\-lgpio)") > +LINE("libgtest", "GoogleTest library (libgtest, \\-lgtest)") > LINE("libhammer", "HAMMER Filesystem Userland Library (libhammer, \\-lhammer)") > LINE("libi386", "i386 Architecture Library (libi386, \\-li386)") > LINE("libintl", "Internationalized Message Handling Library (libintl, \\-lintl)") > > Modified: head/etc/mtree/BSD.tests.dist > ============================================================================== > --- head/etc/mtree/BSD.tests.dist Fri Mar 15 21:11:47 2019 (r345202) > +++ head/etc/mtree/BSD.tests.dist Fri Mar 15 21:43:52 2019 (r345203) > @@ -278,6 +278,16 @@ > static > .. > .. > + googletest > + gmock > + .. > + gmock_main > + .. > + gtest > + .. > + gtest_main > + .. > + .. > libarchive > .. > libc > @@ -429,6 +439,8 @@ > examples > tests > atf > + .. > + googletest > .. > plain > .. > > Modified: head/etc/mtree/BSD.usr.dist > ============================================================================== > --- head/etc/mtree/BSD.usr.dist Fri Mar 15 21:11:47 2019 (r345202) > +++ head/etc/mtree/BSD.usr.dist Fri Mar 15 21:43:52 2019 (r345203) > @@ -13,6 +13,18 @@ > .. > event > .. > + gmock > + internal > + custom > + .. > + .. > + .. > + gtest > + internal > + custom > + .. > + .. > + .. > sqlite3 > .. > ucl > > Modified: head/lib/Makefile > ============================================================================== > --- head/lib/Makefile Fri Mar 15 21:11:47 2019 (r345202) > +++ head/lib/Makefile Fri Mar 15 21:43:52 2019 (r345203) > @@ -170,6 +170,7 @@ _libcplusplus+= libc++fs > .endif > > SUBDIR.${MK_EFI}+= libefivar > +SUBDIR.${MK_GOOGLETEST}+= googletest > SUBDIR.${MK_LIBTHR}+= libthr > SUBDIR.${MK_LLVM_LIBUNWIND}+= libgcc_eh > SUBDIR.${MK_LLVM_LIBUNWIND}+= libgcc_s > > Modified: head/share/examples/tests/tests/Makefile > ============================================================================== > --- head/share/examples/tests/tests/Makefile Fri Mar 15 21:11:47 2019 (r345202) > +++ head/share/examples/tests/tests/Makefile Fri Mar 15 21:43:52 2019 (r345203) > @@ -1,5 +1,7 @@ > # $FreeBSD$ > > +.include <src.opts.mk> > + > # 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 > > Modified: head/share/examples/tests/tests/googletest/Makefile > ============================================================================== > --- projects/import-googletest-1.8.1/share/examples/tests/tests/googletest/Makefile Mon Mar 11 21:56:35 2019 (r345031) > +++ head/share/examples/tests/tests/googletest/Makefile Fri Mar 15 21:43:52 2019 (r345203) > @@ -1,5 +1,25 @@ > # $FreeBSD$ > +# > +# This Makefile differs from the other examples, in the sense that its purpose > +# is to install the upstream provided googletest sample unit tests. > > +# The release package to use for the tests contained within the directory > +# > +# This applies to components which rely on ^/projects/release-pkg support > +# (see UPDATING XXXXXXXXX / svn revision r298107). > +PACKAGE= tests > + > +# Directory into which the Kyuafile provided by this directory will be > +# installed. > +# > +# This is always a subdirectory of ${TESTSBASE}/. The remainder of the > +# path has to match the relative path within the source tree in which > +# these files are found modulo the tests/ component at the end. > +# > +# For example: if this Makefile were in src/bin/cp/tests/, its TESTSDIR > +# would point at ${TESTSBASE}/bin/cp/. > +TESTSDIR= ${TESTSBASE}/share/examples/tests/googletest > + > .PATH: ${SRCTOP}/contrib/googletest/googletest/samples > > GTEST_MAIN_REQ_TESTS+= sample1_unittest > @@ -16,18 +36,21 @@ GTEST_MAIN_REQ_TESTS+= sample8_unittest > #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 > +# List of test programs to build. Note that we can build more than one > +# test from a single directory, and this is expected. > +GTESTS+= ${GTEST_MAIN_REQ_TESTS} ${GTEST_REQ_TESTS} > > -.for t in ${GTEST_REQ_TESTS} > -GTESTS+= $t > +# > +.for t in ${GTESTS} > +.if ${GTEST_MAIN_REQ_TESTS:M$t} > +LIBADD.$t+= gtest_main > +.else > LIBADD.$t+= gtest > +.endif > SRCS.$t+= $t.cc > .endfor > > +# Additional sources for sample testcase 1, 2, 4, and 5. > SRCS.sample1_unittest+= sample1.cc > SRCS.sample2_unittest+= sample2.cc > SRCS.sample4_unittest+= sample4.cc > > Modified: head/share/mk/Makefile > ============================================================================== > --- head/share/mk/Makefile Fri Mar 15 21:11:47 2019 (r345202) > +++ head/share/mk/Makefile Fri Mar 15 21:43:52 2019 (r345203) > @@ -73,6 +73,8 @@ FILESDIR= ${BINDIR}/mk > > .if ${MK_TESTS} != "no" > FILES+= atf.test.mk > +FILES+= googletest.test.inc.mk > +FILES+= googletest.test.mk > FILES+= plain.test.mk > FILES+= suite.test.mk > FILES+= tap.test.mk > > Modified: head/share/mk/bsd.README > ============================================================================== > --- head/share/mk/bsd.README Fri Mar 15 21:11:47 2019 (r345202) > +++ head/share/mk/bsd.README Fri Mar 15 21:43:52 2019 (r345203) > @@ -649,6 +649,8 @@ ATF_TESTS_CXX The names of the ATF C++ test programs t > > ATF_TESTS_SH The names of the ATF sh test programs to build. > > +GTESTS The names of the GoogleTest test programs to build. > + > KYUAFILE If 'auto' (the default), generate a Kyuafile out of the > test programs defined in the Makefile. If 'yes', then a > manually-crafted Kyuafile must be supplied with the > > Modified: head/share/mk/bsd.test.mk > ============================================================================== > --- head/share/mk/bsd.test.mk Fri Mar 15 21:11:47 2019 (r345202) > +++ head/share/mk/bsd.test.mk Fri Mar 15 21:43:52 2019 (r345203) > @@ -63,6 +63,7 @@ _TESTS= > > # Pull in the definitions of all supported test interfaces. > .include <atf.test.mk> > +.include <googletest.test.mk> > .include <plain.test.mk> > .include <tap.test.mk> > > > Copied and modified: head/share/mk/googletest.test.inc.mk (from r345031, projects/import-googletest-1.8.1/share/mk/googletest.test.inc.mk) > ============================================================================== > --- projects/import-googletest-1.8.1/share/mk/googletest.test.inc.mk Mon Mar 11 21:56:35 2019 (r345031, copy source) > +++ head/share/mk/googletest.test.inc.mk Fri Mar 15 21:43:52 2019 (r345203) > @@ -1,10 +1,13 @@ > # $FreeBSD$ > > +# XXX: this should be defined in bsd.sys.mk > +CXXSTD?= c++11 > + > GTESTS_CXXFLAGS+= -DGTEST_HAS_POSIX_RE=1 > GTESTS_CXXFLAGS+= -DGTEST_HAS_PTHREAD=1 > GTESTS_CXXFLAGS+= -DGTEST_HAS_STREAM_REDIRECTION=1 > GTESTS_CXXFLAGS+= -frtti > -GTESTS_CXXFLAGS+= -std=c++11 > +GTESTS_CXXFLAGS+= -std=${CXXSTD} > > # XXX: src.libnames.mk should handle adding this directory. > GTESTS_CXXFLAGS+= -I${DESTDIR}${INCLUDEDIR}/private > > Copied: head/share/mk/googletest.test.mk (from r345031, projects/import-googletest-1.8.1/share/mk/googletest.test.mk) > ============================================================================== > --- /dev/null 00:00:00 1970 (empty, because file is newly added) > +++ head/share/mk/googletest.test.mk Fri Mar 15 21:43:52 2019 (r345203, copy of r345031, projects/import-googletest-1.8.1/share/mk/googletest.test.mk) > @@ -0,0 +1,41 @@ > +# $FreeBSD$ > +# > +# You must include bsd.test.mk instead of this file from your Makefile. > +# > +# Logic to build and install GoogleTest based test programs. > +# > +# GoogleTest is a C++ test framework, thus, it does not describe/articulate how > +# to write tests in other languages, e.g., C or shell, unlike the ATF, plain, > +# and TAP raw test interfaces. > +# > +# For now this is a thin wrapper around the `plain` test interface, but in the > +# future this will rely on a newer version of kyua which will integrate in > +# GoogleTest support. > + > +.if !target(__<bsd.test.mk>__) > +.error googletest.test.mk cannot be included directly. > +.endif > + > +# List of GoogleTest test programs to build. > +# > +# Programs listed here are built according to the semantics of bsd.progs.mk for > +# PROGS_CXX. > +# > +# Test programs registered in this manner are set to be installed into TESTSDIR > +# (which should be overridden by the Makefile) and are not required to provide a > +# manpage. > +GTESTS?= > + > +.if !empty(GTESTS) > +.include <googletest.test.inc.mk> > + > +PROGS_CXX+= ${GTESTS} > +_TESTS+= ${GTESTS} > +.for _T in ${GTESTS} > +BINDIR.${_T}= ${TESTSDIR} > +CXXFLAGS.${_T}+= ${GTESTS_CXXFLAGS} > +MAN.${_T}?= # empty > +SRCS.${_T}?= ${_T}.cc > +TEST_INTERFACE.${_T}= plain > +.endfor > +.endif > > Modified: head/share/mk/src.libnames.mk > ============================================================================== > --- head/share/mk/src.libnames.mk Fri Mar 15 21:11:47 2019 (r345202) > +++ head/share/mk/src.libnames.mk Fri Mar 15 21:43:52 2019 (r345203) > @@ -18,6 +18,10 @@ _PRIVATELIBS= \ > bsdstat \ > devdctl \ > event \ > + gmock \ > + gtest \ > + gmock_main \ > + gtest_main \ > heimipcc \ > heimipcs \ > ldns \ > @@ -302,6 +306,10 @@ _DP_dpv= dialog figpar util ncursesw > _DP_dialog= ncursesw m > _DP_cuse= pthread > _DP_atf_cxx= atf_c > +_DP_gtest= pthread > +_DP_gmock= gtest > +_DP_gmock_main= gmock > +_DP_gtest_main= gtest > _DP_devstat= kvm > _DP_pam= radius tacplus opie md util > .if ${MK_KERBEROS} != "no" > @@ -379,6 +387,15 @@ LIBATF_CXX= ${LIBDESTDIR}${LIBDIR_BASE}/libprivateatf- > LDADD_atf_c= -lprivateatf-c > LDADD_atf_cxx= -lprivateatf-c++ > > +LIBGMOCK= ${LIBDESTDIR}${LIBDIR_BASE}/libprivategmock.a > +LIBGMOCK_MAIN= ${LIBDESTDIR}${LIBDIR_BASE}/libprivategmock_main.a > +LIBGTEST= ${LIBDESTDIR}${LIBDIR_BASE}/libprivategtest.a > +LIBGTEST_MAIN= ${LIBDESTDIR}${LIBDIR_BASE}/libprivategtest_main.a > +LDADD_gmock= -lprivategmock > +LDADD_gtest= -lprivategtest > +LDADD_gmock_main= -lprivategmock_main > +LDADD_gtest_main= -lprivategtest_main > + > .for _l in ${_PRIVATELIBS} > LIB${_l:tu}?= ${LIBDESTDIR}${LIBDIR_BASE}/libprivate${_l}.a > .endfor > @@ -421,6 +438,15 @@ LDADD_${_l}+= ${LDADD_${_d}} > DPADD_atf_cxx+= ${DPADD_atf_c} > LDADD_atf_cxx+= ${LDADD_atf_c} > > +DPADD_gmock+= ${DPADD_gtest} > +LDADD_gmock+= ${LDADD_gtest} > + > +DPADD_gmock_main+= ${DPADD_gmock} > +LDADD_gmock_main+= ${LDADD_gmock} > + > +DPADD_gtest_main+= ${DPADD_gtest} > +LDADD_gtest_main+= ${LDADD_gtest} > + > # Detect LDADD/DPADD that should be LIBADD, before modifying LDADD here. > _BADLDADD= > .for _l in ${LDADD:M-l*:N-l*/*:C,^-l,,} > @@ -562,6 +588,10 @@ LIBROKENDIR= ${OBJTOP}/kerberos5/lib/libroken > LIBWINDDIR= ${OBJTOP}/kerberos5/lib/libwind > LIBATF_CDIR= ${OBJTOP}/lib/atf/libatf-c > LIBATF_CXXDIR= ${OBJTOP}/lib/atf/libatf-c++ > +LIBGMOCKDIR= ${OBJTOP}/lib/googletest/gmock > +LIBGMOCK_MAINDIR= ${OBJTOP}/lib/googletest/gmock_main > +LIBGTESTDIR= ${OBJTOP}/lib/googletest/gtest > +LIBGTEST_MAINDIR= ${OBJTOP}/lib/googletest/gtest_main > LIBALIASDIR= ${OBJTOP}/lib/libalias/libalias > LIBBLACKLISTDIR= ${OBJTOP}/lib/libblacklist > LIBBLOCKSRUNTIMEDIR= ${OBJTOP}/lib/libblocksruntime > > Modified: head/share/mk/src.opts.mk > ============================================================================== > --- head/share/mk/src.opts.mk Fri Mar 15 21:11:47 2019 (r345202) > +++ head/share/mk/src.opts.mk Fri Mar 15 21:43:52 2019 (r345203) > @@ -108,6 +108,7 @@ __DEFAULT_YES_OPTIONS = \ > GDB \ > GNU_DIFF \ > GNU_GREP \ > + GOOGLETEST \ > GPIO \ > HAST \ > HTML \ > @@ -427,6 +428,7 @@ MK_${var}:= no > # Order is somewhat important. > # > .if !${COMPILER_FEATURES:Mc++11} > +MK_GOOGLETEST:= no > MK_LLVM_LIBUNWIND:= no > .endif > > @@ -505,6 +507,10 @@ MK_FREEBSD_UPDATE:= no > > .if ${MK_TESTS} == "no" > MK_DTRACE_TESTS:= no > +.endif > + > +.if ${MK_TESTS_SUPPORT} == "no" > +MK_GOOGLETEST:= no > .endif > > .if ${MK_ZONEINFO} == "no" > > Modified: head/tools/build/mk/OptionalObsoleteFiles.inc > ============================================================================== > --- head/tools/build/mk/OptionalObsoleteFiles.inc Fri Mar 15 21:11:47 2019 (r345202) > +++ head/tools/build/mk/OptionalObsoleteFiles.inc Fri Mar 15 21:43:52 2019 (r345203) > @@ -2776,6 +2776,135 @@ OLD_FILES+=usr/libexec/gdb > OLD_FILES+=usr/libexec/kgdb > .endif > > +.if ${MK_GOOGLETEST} == no > +OLD_FILES+=usr/include/gmock/gmock-actions.h > +OLD_FILES+=usr/include/gmock/gmock-cardinalities.h > +OLD_FILES+=usr/include/gmock/gmock-generated-actions.h > +OLD_FILES+=usr/include/gmock/gmock-generated-function-mockers.h > +OLD_FILES+=usr/include/gmock/gmock-generated-matchers.h > +OLD_FILES+=usr/include/gmock/gmock-generated-nice-strict.h > +OLD_FILES+=usr/include/gmock/gmock-matchers.h > +OLD_FILES+=usr/include/gmock/gmock-more-actions.h > +OLD_FILES+=usr/include/gmock/gmock-more-matchers.h > +OLD_FILES+=usr/include/gmock/gmock-spec-builders.h > +OLD_FILES+=usr/include/gmock/gmock.h > +OLD_FILES+=usr/include/gmock/internal/custom/gmock-generated-actions.h > +OLD_FILES+=usr/include/gmock/internal/custom/gmock-matchers.h > +OLD_FILES+=usr/include/gmock/internal/custom/gmock-port.h > +OLD_FILES+=usr/include/gmock/internal/gmock-generated-internal-utils.h > +OLD_FILES+=usr/include/gmock/internal/gmock-internal-utils.h > +OLD_FILES+=usr/include/gmock/internal/gmock-port.h > +OLD_DIRS+=usr/include/gmock > +OLD_FILES+=usr/include/gtest/gtest_pred_impl.h > +OLD_FILES+=usr/include/gtest/gtest_prod.h > +OLD_FILES+=usr/include/gtest/gtest-death-test.h > +OLD_FILES+=usr/include/gtest/gtest-message.h > +OLD_FILES+=usr/include/gtest/gtest-param-test.h > +OLD_FILES+=usr/include/gtest/gtest-printers.h > +OLD_FILES+=usr/include/gtest/gtest-spi.h > +OLD_FILES+=usr/include/gtest/gtest-test-part.h > +OLD_FILES+=usr/include/gtest/gtest-typed-test.h > +OLD_FILES+=usr/include/gtest/gtest.h > +OLD_FILES+=usr/include/gtest/internal/custom/gtest-port.h > +OLD_FILES+=usr/include/gtest/internal/custom/gtest-printers.h > +OLD_FILES+=usr/include/gtest/internal/custom/gtest.h > +OLD_FILES+=usr/include/gtest/internal/gtest-death-test-internal.h > +OLD_FILES+=usr/include/gtest/internal/gtest-filepath.h > +OLD_FILES+=usr/include/gtest/internal/gtest-internal.h > +OLD_FILES+=usr/include/gtest/internal/gtest-linked_ptr.h > +OLD_FILES+=usr/include/gtest/internal/gtest-param-util-generated.h > +OLD_FILES+=usr/include/gtest/internal/gtest-param-util.h > +OLD_FILES+=usr/include/gtest/internal/gtest-port-arch.h > +OLD_FILES+=usr/include/gtest/internal/gtest-port.h > +OLD_FILES+=usr/include/gtest/internal/gtest-string.h > +OLD_FILES+=usr/include/gtest/internal/gtest-tuple.h > +OLD_FILES+=usr/include/gtest/internal/gtest-type-util.h > +OLD_DIRS+=usr/include/gtest > +OLD_FILES+=usr/lib/libprivategmock_main.a > +OLD_FILES+=usr/lib/libprivategmock_main.so > +OLD_LIBS+=usr/lib/libprivategmock_main.so.0 > +OLD_FILES+=usr/lib/libprivategmock_main_p.a > +OLD_FILES+=usr/lib/libprivategmock.a > +OLD_FILES+=usr/lib/libprivategmock.so > +OLD_LIBS+=usr/lib/libprivategmock.so.0 > +OLD_FILES+=usr/lib/libprivategmock_p.a > +OLD_FILES+=usr/lib/libprivategtest_main.a > +OLD_FILES+=usr/lib/libprivategtest_main.so > +OLD_LIBS+=usr/lib/libprivategtest_main.so.0 > +OLD_FILES+=usr/lib/libprivategtest_main_p.a > +OLD_FILES+=usr/lib/libprivategtest.a > +OLD_FILES+=usr/lib/libprivategtest.so > +OLD_LIBS+=usr/lib/libprivategtest.so.0 > +OLD_FILES+=usr/lib/libprivategtest_p.a > +OLD_FILES+=usr/tests/lib/googletest/gmock/gmock_stress_test > +OLD_FILES+=usr/tests/lib/googletest/gmock/Kyuafile > +OLD_DIRS+=usr/tests/lib/googletest/gmock > +OLD_FILES+=usr/tests/lib/googletest/gmock_main/gmock_ex_test > +OLD_FILES+=usr/tests/lib/googletest/gmock_main/gmock_link_test > +OLD_FILES+=usr/tests/lib/googletest/gmock_main/gmock_test > +OLD_FILES+=usr/tests/lib/googletest/gmock_main/gmock-actions_test > +OLD_FILES+=usr/tests/lib/googletest/gmock_main/gmock-cardinalities_test > +OLD_FILES+=usr/tests/lib/googletest/gmock_main/gmock-ex_test > +OLD_FILES+=usr/tests/lib/googletest/gmock_main/gmock-generated-actions_test > +OLD_FILES+=usr/tests/lib/googletest/gmock_main/gmock-generated-function-mockers_test > +OLD_FILES+=usr/tests/lib/googletest/gmock_main/gmock-generated-internal-utils_test > +OLD_FILES+=usr/tests/lib/googletest/gmock_main/gmock-generated-matchers_test > +OLD_FILES+=usr/tests/lib/googletest/gmock_main/gmock-internal-utils_test > +OLD_FILES+=usr/tests/lib/googletest/gmock_main/gmock-matchers_test > +OLD_FILES+=usr/tests/lib/googletest/gmock_main/gmock-more-actions_test > +OLD_FILES+=usr/tests/lib/googletest/gmock_main/gmock-nice-strict_test > +OLD_FILES+=usr/tests/lib/googletest/gmock_main/gmock-port_test > +OLD_FILES+=usr/tests/lib/googletest/gmock_main/gmock-spec-builders_test > +OLD_FILES+=usr/tests/lib/googletest/gmock_main/Kyuafile > +OLD_DIRS+=usr/tests/lib/googletest/gmock_main > +OLD_FILES+=usr/tests/lib/googletest/gtest/googletest-param-test-test > +OLD_FILES+=usr/tests/lib/googletest/gtest/gtest_all_test > +OLD_FILES+=usr/tests/lib/googletest/gtest/gtest_environment_test > +OLD_FILES+=usr/tests/lib/googletest/gtest/gtest_no_test_unittest > +OLD_FILES+=usr/tests/lib/googletest/gtest/gtest_premature_exit_test > +OLD_FILES+=usr/tests/lib/googletest/gtest/gtest_repeat_test > +OLD_FILES+=usr/tests/lib/googletest/gtest/gtest_stress_test > +OLD_FILES+=usr/tests/lib/googletest/gtest/gtest_throw_on_failure_ex_test > +OLD_FILES+=usr/tests/lib/googletest/gtest/gtest-death-test_ex_catch_test > +OLD_FILES+=usr/tests/lib/googletest/gtest/gtest-death-test_ex_nocatch_test > +OLD_FILES+=usr/tests/lib/googletest/gtest/gtest-unittest-api_test > +OLD_FILES+=usr/tests/lib/googletest/gtest/Kyuafile > +OLD_DIRS+=usr/tests/lib/googletest/gtest > +OLD_FILES+=usr/tests/lib/googletest/gtest_main/googletest-death-test-test > +OLD_FILES+=usr/tests/lib/googletest/gtest_main/googletest-filepath-test > +OLD_FILES+=usr/tests/lib/googletest/gtest_main/googletest-linked-ptr-test > +OLD_FILES+=usr/tests/lib/googletest/gtest_main/googletest-listener-test > +OLD_FILES+=usr/tests/lib/googletest/gtest_main/googletest-message-test > +OLD_FILES+=usr/tests/lib/googletest/gtest_main/googletest-options-test > +OLD_FILES+=usr/tests/lib/googletest/gtest_main/googletest-port-test > +OLD_FILES+=usr/tests/lib/googletest/gtest_main/googletest-printers-test > +OLD_FILES+=usr/tests/lib/googletest/gtest_main/googletest-test-part-test > +OLD_FILES+=usr/tests/lib/googletest/gtest_main/gtest_help_test_ > +OLD_FILES+=usr/tests/lib/googletest/gtest_main/gtest_main_unittest > +OLD_FILES+=usr/tests/lib/googletest/gtest_main/gtest_pred_impl_unittest > +OLD_FILES+=usr/tests/lib/googletest/gtest_main/gtest_prod_test > +OLD_FILES+=usr/tests/lib/googletest/gtest_main/gtest_sole_header_test > +OLD_FILES+=usr/tests/lib/googletest/gtest_main/gtest_unittest > +OLD_FILES+=usr/tests/lib/googletest/gtest_main/gtest_xml_outfile1_test_ > +OLD_FILES+=usr/tests/lib/googletest/gtest_main/gtest_xml_outfile2_test_ > +OLD_FILES+=usr/tests/lib/googletest/gtest_main/gtest-typed-test_test > +OLD_FILES+=usr/tests/lib/googletest/gtest_main/Kyuafile > +OLD_DIRS+=usr/tests/lib/googletest/gtest_main > +OLD_FILES+=usr/tests/lib/googletest/Kyuafile > +OLD_DIRS+=usr/tests/lib/googletest/ > +OLD_FILES+=usr/tests/share/examples/tests/googletest/Kyuafile > +OLD_FILES+=usr/tests/share/examples/tests/googletest/sample1_unittest > +OLD_FILES+=usr/tests/share/examples/tests/googletest/sample10_unittest > +OLD_FILES+=usr/tests/share/examples/tests/googletest/sample2_unittest > +OLD_FILES+=usr/tests/share/examples/tests/googletest/sample3_unittest > +OLD_FILES+=usr/tests/share/examples/tests/googletest/sample4_unittest > +OLD_FILES+=usr/tests/share/examples/tests/googletest/sample5_unittest > +OLD_FILES+=usr/tests/share/examples/tests/googletest/sample6_unittest > +OLD_FILES+=usr/tests/share/examples/tests/googletest/sample7_unittest > +OLD_FILES+=usr/tests/share/examples/tests/googletest/sample8_unittest > +OLD_DIRS+=usr/tests/share/examples/tests/googletest > +.endif > + > .if ${MK_GPIO} == no > OLD_FILES+=usr/include/libgpio.h > OLD_FILES+=usr/lib/libgpio.a > > Copied and modified: head/tools/build/options/WITHOUT_GOOGLETEST (from r345031, projects/import-googletest-1.8.1/tools/build/options/WITHOUT_GOOGLETEST) > ============================================================================== > --- projects/import-googletest-1.8.1/tools/build/options/WITHOUT_GOOGLETEST Mon Mar 11 21:56:35 2019 (r345031, copy source) > +++ head/tools/build/options/WITHOUT_GOOGLETEST Fri Mar 15 21:43:52 2019 (r345203) > @@ -1,5 +1,5 @@ > .\" $FreeBSD$ > -Set to not build nor install > +Set to neither build nor install > .Lb libgmock , > .Lb libgtest , > and dependent tests. >
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAJ-VmonXDOFr9SEmOup=-Lht6W%2Bpt=6PTaa04izih3xLZNBhvw>