From owner-svn-src-projects@freebsd.org Wed Feb 20 07:49:10 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 64CAB14E9968 for ; Wed, 20 Feb 2019 07:49:10 +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 0B84D6B85D; Wed, 20 Feb 2019 07:49:10 +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 F2DB923D1; Wed, 20 Feb 2019 07:49:09 +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 x1K7n9s3036953; Wed, 20 Feb 2019 07:49:09 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x1K7n9xb036952; Wed, 20 Feb 2019 07:49:09 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201902200749.x1K7n9xb036952@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 07:49:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r344346 - projects/import-googletest-1.8.1/lib/googletest/gtest_main/tests X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: projects/import-googletest-1.8.1/lib/googletest/gtest_main/tests X-SVN-Commit-Revision: 344346 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 0B84D6B85D 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]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-0.999,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 07:49:10 -0000 Author: ngie Date: Wed Feb 20 07:49:09 2019 New Revision: 344346 URL: https://svnweb.freebsd.org/changeset/base/344346 Log: Apply lessons learned in r344345 on gtest_main tests The key difference is that some of the programs were previously being compiled and installed as tests, which is incorrect. Treat them like helpers instead. Modified: projects/import-googletest-1.8.1/lib/googletest/gtest_main/tests/Makefile Modified: projects/import-googletest-1.8.1/lib/googletest/gtest_main/tests/Makefile ============================================================================== --- projects/import-googletest-1.8.1/lib/googletest/gtest_main/tests/Makefile Wed Feb 20 07:29:50 2019 (r344345) +++ projects/import-googletest-1.8.1/lib/googletest/gtest_main/tests/Makefile Wed Feb 20 07:49:09 2019 (r344346) @@ -20,15 +20,30 @@ GTESTS+= googletest-test-part-test GTESTS+= gtest-typed-test_test GTESTS+= gtest_unittest -.for test in ${GTESTS} -SRCS.${test}= gtest_main.cc -.endfor - CXXFLAGS+= -I${GOOGLETEST_SRCROOT}/include CXXFLAGS+= -I${GOOGLETEST_SRCROOT} -SRCS.gtest-typed-test_test+= gtest-typed-test2_test.cc +HELPERS+= gtest_help_test_ +HELPERS+= gtest_xml_outfile1_test_ +HELPERS+= gtest_xml_outfile2_test_ -LIBADD= gtest +BINDIR= ${TESTSDIR} +PROGS_CXX+= ${HELPERS} + +SRCS.gtest-typed-test_test= \ + gtest-typed-test_test.cc \ + gtest-typed-test2_test.cc + +SRCS.gtest_prod_test= \ + gtest_prod_test.cc \ + production.cc + +LIBADD+= gtest gtest_main + +LIBADD.googletest-port-test+= pthread +LIBADD.gtest_unittest+= pthread + +# XXX: https://github.com/google/googletest/pull/2119 +NO_WERROR= .include