From owner-svn-src-projects@freebsd.org Wed Feb 20 07:21:23 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 92BD914E908F for ; Wed, 20 Feb 2019 07:21:23 +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 2EBA26A7C0; Wed, 20 Feb 2019 07:21:23 +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 793ED1F04; Wed, 20 Feb 2019 07:21:22 +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 x1K7LMn5025105; Wed, 20 Feb 2019 07:21:22 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x1K7LMd0025104; Wed, 20 Feb 2019 07:21:22 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201902200721.x1K7LMd0025104@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:21:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r344344 - projects/import-googletest-1.8.1/contrib/googletest/googletest/test X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: projects/import-googletest-1.8.1/contrib/googletest/googletest/test X-SVN-Commit-Revision: 344344 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 2EBA26A7C0 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:21:23 -0000 Author: ngie Date: Wed Feb 20 07:21:22 2019 New Revision: 344344 URL: https://svnweb.freebsd.org/changeset/base/344344 Log: Don't hardcode the source filename In order to compile these tests with different CXXFLAGS, I needed to copy them to different filenames to trick the compiler. Unfortunately, this triggers a failure with one of the tests as it hardcodes the path to the test, instead of relying on the compiler to fill in the path via `__FILE__`. Using `__FILE__` is standard and works. Rely on it instead of a hardcoded path. Modified: projects/import-googletest-1.8.1/contrib/googletest/googletest/test/googletest-death-test_ex_test.cc Modified: projects/import-googletest-1.8.1/contrib/googletest/googletest/test/googletest-death-test_ex_test.cc ============================================================================== --- projects/import-googletest-1.8.1/contrib/googletest/googletest/test/googletest-death-test_ex_test.cc Wed Feb 20 07:10:38 2019 (r344343) +++ projects/import-googletest-1.8.1/contrib/googletest/googletest/test/googletest-death-test_ex_test.cc Wed Feb 20 07:21:22 2019 (r344344) @@ -68,7 +68,7 @@ TEST(CxxExceptionDeathTest, PrintsMessageForStdExcepti "exceptional message"); // Verifies that the location is mentioned in the failure text. EXPECT_NONFATAL_FAILURE(EXPECT_DEATH(throw TestException(), ""), - "googletest-death-test_ex_test.cc"); + __FILE__); } # endif // GTEST_HAS_EXCEPTIONS