From owner-svn-src-projects@freebsd.org Thu Feb 21 03:37:32 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 D3F0F14ED9A4 for ; Thu, 21 Feb 2019 03:37:31 +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 7B56488554; Thu, 21 Feb 2019 03:37:31 +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 68957FB62; Thu, 21 Feb 2019 03:37:31 +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 x1L3bVlR013545; Thu, 21 Feb 2019 03:37:31 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x1L3bV9x013544; Thu, 21 Feb 2019 03:37:31 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201902210337.x1L3bV9x013544@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Enji Cooper Date: Thu, 21 Feb 2019 03:37:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r344416 - projects/import-googletest-1.8.1/lib/googletest/gtest/tests X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: projects/import-googletest-1.8.1/lib/googletest/gtest/tests X-SVN-Commit-Revision: 344416 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 7B56488554 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.96)[-0.964,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: Thu, 21 Feb 2019 03:37:32 -0000 Author: ngie Date: Thu Feb 21 03:37:31 2019 New Revision: 344416 URL: https://svnweb.freebsd.org/changeset/base/344416 Log: Build death tests programmatically The previous code hardcoded the death test build definitions in a duplicative manner. The new code doesn't. Modified: projects/import-googletest-1.8.1/lib/googletest/gtest/tests/Makefile Modified: projects/import-googletest-1.8.1/lib/googletest/gtest/tests/Makefile ============================================================================== --- projects/import-googletest-1.8.1/lib/googletest/gtest/tests/Makefile Thu Feb 21 03:36:09 2019 (r344415) +++ projects/import-googletest-1.8.1/lib/googletest/gtest/tests/Makefile Thu Feb 21 03:37:31 2019 (r344416) @@ -4,8 +4,6 @@ .PATH: ${GOOGLETEST_SRCROOT}/src ${GOOGLETEST_SRCROOT}/test -GTESTS+= gtest-death-test_ex_catch_test -GTESTS+= gtest-death-test_ex_nocatch_test GTESTS+= gtest_environment_test GTESTS+= gtest_no_test_unittest GTESTS+= googletest-param-test-test @@ -18,16 +16,19 @@ GTESTS+= gtest-unittest-api_test CXXFLAGS+= -I${GOOGLETEST_SRCROOT}/include CXXFLAGS+= -I${GOOGLETEST_SRCROOT} -gtest-death-test_ex_catch_test.cc gtest-death-test_ex_nocatch_test.cc: googletest-death-test_ex_test.cc +.for death_test in gtest-death-test_ex_catch_test gtest-death-test_ex_nocatch_test +# XXX: copying source files in order to tweak CXXFLAGS seems hacky. +${death_test}.cc: googletest-death-test_ex_test.cc ${CP} ${.ALLSRC} ${.TARGET} +CLEANFILES+= ${death_test}.cc +CXXFLAGS.${death_test}+= -fexception +.endfor -CXXFLAGS.gtest-death-test_ex_catch_test+= \ - -DGTEST_ENABLE_CATCH_EXCEPTIONS_=1 \ - -fexceptions +CXXFLAGS.gtest-death-test_ex_catch_test+= \ + -DGTEST_ENABLE_CATCH_EXCEPTIONS_=1 CXXFLAGS.gtest-death-test_ex_nocatch_test+= \ - -DGTEST_ENABLE_CATCH_EXCEPTIONS_=0 \ - -fexceptions + -DGTEST_ENABLE_CATCH_EXCEPTIONS_=0 SRCS.googletest-param-test-test= \ googletest-param-test-test.cc \