From owner-svn-src-projects@freebsd.org Wed Feb 20 09:33:56 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 6737114EC93B for ; Wed, 20 Feb 2019 09:33:56 +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 0A4D66EFAC; Wed, 20 Feb 2019 09:33:56 +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 EE69F3834; Wed, 20 Feb 2019 09:33:55 +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 x1K9XtIF094306; Wed, 20 Feb 2019 09:33:55 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x1K9XtKk094305; Wed, 20 Feb 2019 09:33:55 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201902200933.x1K9XtKk094305@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 09:33:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r344350 - projects/import-googletest-1.8.1/lib/googletest/gmock_main/tests X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: projects/import-googletest-1.8.1/lib/googletest/gmock_main/tests X-SVN-Commit-Revision: 344350 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 0A4D66EFAC 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)[-1.000,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 09:33:56 -0000 Author: ngie Date: Wed Feb 20 09:33:55 2019 New Revision: 344350 URL: https://svnweb.freebsd.org/changeset/base/344350 Log: Fix test compilation for gmock_main tests, similar to r344345 Modified: projects/import-googletest-1.8.1/lib/googletest/gmock_main/tests/Makefile Modified: projects/import-googletest-1.8.1/lib/googletest/gmock_main/tests/Makefile ============================================================================== --- projects/import-googletest-1.8.1/lib/googletest/gmock_main/tests/Makefile Wed Feb 20 08:04:08 2019 (r344349) +++ projects/import-googletest-1.8.1/lib/googletest/gmock_main/tests/Makefile Wed Feb 20 09:33:55 2019 (r344350) @@ -6,7 +6,7 @@ GTESTS+= gmock-actions_test GTESTS+= gmock-cardinalities_test -GTESTS+= gmock-ex_test +GTESTS+= gmock_ex_test GTESTS+= gmock-generated-actions_test GTESTS+= gmock-generated-function-mockers_test GTESTS+= gmock-generated-internal-utils_test @@ -22,13 +22,16 @@ GTESTS+= gmock_test CXXFLAGS+= -I${GOOGLEMOCK_SRCROOT}/include CXXFLAGS+= -I${GOOGLEMOCK_SRCROOT} +CXXFLAGS+= -I${GOOGLETEST_SRCROOT}/include +CXXFLAGS+= -I${GOOGLETEST_SRCROOT} -.for test in ${GTESTS} -SRCS.${test}= gmock_main.cc -.endfor +SRCS.gmock_link_test= \ + gmock_link_test.cc \ + gmock_link2_test.cc -SRCS.gmock_link_test+= gmock_link2_test.cc +LIBADD= gmock_main gmock gtest -LIBADD= gmock +# XXX: https://github.com/google/googletest/pull/2119 +NO_WERROR= .include