Date: Tue, 15 Aug 2023 20:15:58 +0100 From: Jessica Clarke <jrtc27@freebsd.org> To: Enji Cooper <ngie@FreeBSD.org> Cc: "src-committers@freebsd.org" <src-committers@FreeBSD.org>, "dev-commits-src-all@freebsd.org" <dev-commits-src-all@FreeBSD.org>, "dev-commits-src-main@freebsd.org" <dev-commits-src-main@FreeBSD.org> Subject: Re: git: 28f6c2f29280 - main - Import GoogleTest 1.14.0 Message-ID: <5759AF55-F1DE-4128-9579-B0A654114D92@freebsd.org> In-Reply-To: <202308100232.37A2Wdaw040438@gitrepo.freebsd.org> References: <202308100232.37A2Wdaw040438@gitrepo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On 10 Aug 2023, at 03:32, Enji Cooper <ngie@FreeBSD.org> wrote: >=20 > The branch main has been updated by ngie: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3D28f6c2f292806bf31230a959bc4b19d7= 081669a7 >=20 > commit 28f6c2f292806bf31230a959bc4b19d7081669a7 > Author: Enji Cooper <ngie@FreeBSD.org> > AuthorDate: 2023-08-08 06:17:32 +0000 > Commit: Enji Cooper <ngie@FreeBSD.org> > CommitDate: 2023-08-10 09:32:33 +0000 >=20 > Import GoogleTest 1.14.0 This should be a merge commit from the vendor branch but isn=E2=80=99t. > GoogleTest 1.14.0 now requires C++14 to build. Change > `googletest.test.inc.mk` to reflect this requirement. >=20 > Adjust the build integration logic to handle the new version of > GoogleTest (add/remove headers/sources as needed). >=20 > Tighten down warnings via `CXXFLAGS.clang` instead of ignoring all > warnings. Some new warnings snuck in after I did my last round of = fix > submissions upstream. >=20 > Also address some overlinking added in the previous version import = by > removing superfluous libraries. >=20 > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D >=20 > Expect WhenDynamicCastToTest.AmbiguousCast to fail >=20 > This change reapplies the expected failure from 1.10.0. >=20 > Ref: https://github.com/google/googletest/issues/2172 >=20 > MFC after: 2 weeks > Reviewed by: asomers, emaste > Differential Revision: https://reviews.freebsd.org/D41399 >=20 > Merge commit '8ef491440fcaec96f899d73e08873426c78583a4' into = googletest-v1.14.0-import What=E2=80=99s this thing? Sounds like you did some merging, squashing = and rebasing, didn=E2=80=99t fix up the commit message and didn=E2=80=99t = notice that git rebase eats merges? See [1] for how to do this properly. Jess [1] = https://docs.freebsd.org/en/articles/committers-guide/#_rebasing_your_chan= ge_against_latest_freebsd_source_tree
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?5759AF55-F1DE-4128-9579-B0A654114D92>