From owner-svn-src-projects@freebsd.org Wed Feb 20 20:10:05 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 C2EB414DA174 for ; Wed, 20 Feb 2019 20:10:05 +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 4DFC46B239; Wed, 20 Feb 2019 20:10:05 +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 CB525A631; Wed, 20 Feb 2019 20:10:00 +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 x1KKA0G3056406; Wed, 20 Feb 2019 20:10:00 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x1KKA0S3056401; Wed, 20 Feb 2019 20:10:00 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201902202010.x1KKA0S3056401@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 20:10:00 +0000 (UTC) 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 X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: in projects/import-googletest-1.8.1: lib/googletest share/mk X-SVN-Commit-Revision: 344380 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 4DFC46B239 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.98 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.98)[-0.983,0]; 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: Wed, 20 Feb 2019 20:10:06 -0000 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 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 + 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