Date: Wed, 20 Feb 2019 20:10:00 +0000 (UTC) From: Enji Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r344380 - in projects/import-googletest-1.8.1: lib/googletest share/mk Message-ID: <201902202010.x1KKA0S3056401@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ngie Date: Wed Feb 20 20:09:59 2019 New Revision: 344380 URL: https://svnweb.freebsd.org/changeset/base/344380 Log: Correct gmock/gtest expectations w.r.t. C++11/RTTI Long story short, some of the tests were failing because they expected either dynamic_cast or RTTI to be functional and it wasn't. Move all common CXXFLAGS out to googletest.test.inc.mk and reference it from googletest.test.mk and .../googletest/Makefile.inc Added: projects/import-googletest-1.8.1/share/mk/googletest.test.inc.mk (contents, props changed) Modified: projects/import-googletest-1.8.1/lib/googletest/Makefile.inc projects/import-googletest-1.8.1/share/mk/Makefile projects/import-googletest-1.8.1/share/mk/googletest.test.mk Modified: projects/import-googletest-1.8.1/lib/googletest/Makefile.inc ============================================================================== --- projects/import-googletest-1.8.1/lib/googletest/Makefile.inc Wed Feb 20 19:32:02 2019 (r344379) +++ projects/import-googletest-1.8.1/lib/googletest/Makefile.inc Wed Feb 20 20:09:59 2019 (r344380) @@ -1,12 +1,12 @@ # $FreeBSD$ -CXXFLAGS+= -DGTEST_HAS_POSIX_RE=1 -CXXFLAGS+= -DGTEST_HAS_PTHREAD=1 -CXXFLAGS+= -DGTEST_HAS_STREAM_REDIRECTION=1 +.include <googletest.test.inc.mk> GTEST_DIR= ${SRCTOP}/contrib/googletest -GOOGLEMOCK_SRCROOT= ${GTEST_DIR}/googlemock -GOOGLETEST_SRCROOT= ${GTEST_DIR}/googletest +GOOGLEMOCK_SRCROOT= ${GTEST_DIR}/googlemock +GOOGLETEST_SRCROOT= ${GTEST_DIR}/googletest + +CXXFLAGS+= ${GTESTS_FLAGS} NO_WTHREAD_SAFETY= Modified: projects/import-googletest-1.8.1/share/mk/Makefile ============================================================================== --- projects/import-googletest-1.8.1/share/mk/Makefile Wed Feb 20 19:32:02 2019 (r344379) +++ projects/import-googletest-1.8.1/share/mk/Makefile Wed Feb 20 20:09:59 2019 (r344380) @@ -73,6 +73,7 @@ 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 Added: projects/import-googletest-1.8.1/share/mk/googletest.test.inc.mk ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/import-googletest-1.8.1/share/mk/googletest.test.inc.mk Wed Feb 20 20:09:59 2019 (r344380) @@ -0,0 +1,9 @@ +# $FreeBSD$ + +GTESTS_CXXFLAGS+= -DGTESTS_HAS_RTTI=1 +GTESTS_CXXFLAGS+= -DGTESTS_HAS_POSIX_RE=1 +GTESTS_CXXFLAGS+= -DGTESTS_HAS_PTHREAD=1 +GTESTS_CXXFLAGS+= -DGTESTS_HAS_STREAM_REDIRECTION=1 +GTESTS_CXXFLAGS+= -DGTESTS_LANG_CXX11=1 +GTESTS_CXXFLAGS+= -frtti +GTESTS_CXXFLAGS+= -std=c++11 Modified: projects/import-googletest-1.8.1/share/mk/googletest.test.mk ============================================================================== --- projects/import-googletest-1.8.1/share/mk/googletest.test.mk Wed Feb 20 19:32:02 2019 (r344379) +++ projects/import-googletest-1.8.1/share/mk/googletest.test.mk Wed Feb 20 20:09:59 2019 (r344380) @@ -27,10 +27,13 @@ GTESTS?= .if !empty(GTESTS) +.include <googletest.test.flags.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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201902202010.x1KKA0S3056401>