From nobody Tue Aug 15 19:15:58 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RQLbJ6xZCz4qJkZ for ; Tue, 15 Aug 2023 19:16:12 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RQLbJ09xlz3Pyp for ; Tue, 15 Aug 2023 19:16:12 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Authentication-Results: mx1.freebsd.org; dkim=none; spf=pass (mx1.freebsd.org: domain of jrtc27@jrtc27.com designates 209.85.128.52 as permitted sender) smtp.mailfrom=jrtc27@jrtc27.com; dmarc=none Received: by mail-wm1-f52.google.com with SMTP id 5b1f17b1804b1-3fe4ad22e36so53939705e9.2 for ; Tue, 15 Aug 2023 12:16:11 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692126970; x=1692731770; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=0OEboiv/LnFPetM4ITcyQPbmnKc5yndhHPRhuYncY00=; b=mDCnvBM61jNXiN3ZMTW8M7nRm8x8ZklOLnNkr99/lq3x3QpsRwKRGckBIK7zK5sByZ LuS3gJP/7tgeGsFUcps7OE8UYNSmie2RfmkYBbpDGAVHns4JDHg2MmTJQ/5agQ+aHB93 cHCNnoo/YG8Kq8f691zlp+25o2IaMFJXPDNG0oQEXBeQOu9AvwOW/K17I/Kb2foHi0Ek gCL46cxTWmVn9GYiXzoPLVrAVKNrIleUfsGTDbvkc583rCL7UIBwaWmJ7fVFFXCkR5P/ fHibWx9Hvxl26DOIJE7Rv3XHeKSIUTxeMeil39scLSHfDLwennBFghpEQJjFzKYnsgSN WLHQ== X-Gm-Message-State: AOJu0YzdutTJ/Xf04h10VWwAvYR+M9K3wkgNQmZqeFtFD/5FTDnflVit Bw9e+KQXFFl24PrNWY+JnPHTXm8+bfQMtTzyItI= X-Google-Smtp-Source: AGHT+IHbvfe/wsaX9VOr9MAE4lEdp9hMLzopv72SIQeKHMGng9Z/xKPA04TZc6Y8T1fLSYtjVSc7pw== X-Received: by 2002:a1c:7208:0:b0:3fa:99d6:4798 with SMTP id n8-20020a1c7208000000b003fa99d64798mr10963855wmc.37.1692126969429; Tue, 15 Aug 2023 12:16:09 -0700 (PDT) Received: from smtpclient.apple ([131.111.5.246]) by smtp.gmail.com with ESMTPSA id e6-20020adffd06000000b003196b1bb528sm12140679wrr.64.2023.08.15.12.16.08 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 15 Aug 2023 12:16:09 -0700 (PDT) Content-Type: text/plain; charset=utf-8 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3731.600.7\)) Subject: Re: git: 28f6c2f29280 - main - Import GoogleTest 1.14.0 From: Jessica Clarke In-Reply-To: <202308100232.37A2Wdaw040438@gitrepo.freebsd.org> Date: Tue, 15 Aug 2023 20:15:58 +0100 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: <5759AF55-F1DE-4128-9579-B0A654114D92@freebsd.org> References: <202308100232.37A2Wdaw040438@gitrepo.freebsd.org> To: Enji Cooper X-Mailer: Apple Mail (2.3731.600.7) X-Spamd-Result: default: False [-2.50 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-1.000]; MV_CASE(0.50)[]; FORGED_SENDER(0.30)[jrtc27@freebsd.org,jrtc27@jrtc27.com]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17]; MIME_GOOD(-0.10)[text/plain]; TO_DN_EQ_ADDR_SOME(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[dev-commits-src-main@freebsd.org]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; DMARC_NA(0.00)[freebsd.org]; MLMMJ_DEST(0.00)[dev-commits-src-main@freebsd.org]; RCVD_IN_DNSWL_NONE(0.00)[209.85.128.52:from]; FROM_HAS_DN(0.00)[]; ARC_NA(0.00)[]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.128.52:from]; RCVD_TLS_LAST(0.00)[]; TO_DN_SOME(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FREEFALL_USER(0.00)[jrtc27]; R_DKIM_NA(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; MIME_TRACE(0.00)[0:+]; FROM_NEQ_ENVFROM(0.00)[jrtc27@freebsd.org,jrtc27@jrtc27.com]; RCVD_COUNT_TWO(0.00)[2] X-Spamd-Bar: -- X-Rspamd-Queue-Id: 4RQLbJ09xlz3Pyp On 10 Aug 2023, at 03:32, Enji Cooper 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 > AuthorDate: 2023-08-08 06:17:32 +0000 > Commit: Enji Cooper > 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