From nobody Thu Nov 06 15:22:53 2025 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 4d2QtP2LLgz6GLSB; Thu, 06 Nov 2025 15:22:53 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d2QtP1PrJz4Dsg; Thu, 06 Nov 2025 15:22:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762442573; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6EcGiY8ZYforiJizuHcSxvIaQwLTZxXRp1y8I1wjPbc=; b=UnE+7tLYeq+K2Y2yzE/hp1RbjMqjAb3ZAhL9Oxvk/pF2KP+JoDdavxbzmAmOVnkSViP+dc C9Xnaicyst1CoIkyj7duZHpoDKi11Y32PVnHs+jVZd/B+N8huAKYqwRo5nau6ZXtq6/Kmz oiw5fxyDTuKt4nDVggkt4YyGrY862sq3ef9av7urSz2gGTfCrDrcIWiqm2ZE+Z0X746aO+ 45SVpggL0ybUB3wBpz9+5O0k+MRyE0mvcIrAZnp/ql8QLL0oBN3rcZa7+h01nLEnod5T2I ML/oAWWP5cFgXH6CMZVYWN4v/3BnPblmLjzj8JfqA2/vES32U3nKxqLzoHtW5A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762442573; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6EcGiY8ZYforiJizuHcSxvIaQwLTZxXRp1y8I1wjPbc=; b=DJ1kJbaKAlNQRi3YPLPJDlY7n03C3Dl+RDcgbDMM9978s0CcQhdVtpNVcSQ3AQQ9oFoa7/ HyGr8kwLGWUPPT7Gz1bK0yF/yrv3+pgqqW1K6PtrIGMpZ3MZOLsqDEOQmTOpB7DbeM4Z/2 4i09Ot1FPzrzc0xcJ20IjPEMJiRnHkPGAjkwQ1xDTNxKpvfudUmZsFG+jgSSNumlJ+GYLb YRqtPhr6daE6xm+44sKN1V6L8978bd9QF+nCYWld2vqVxmXq4UpOCU9qZYd0L/BZZn1SAV GLzwkSz5u/naq38Alx9Hv5ET1Y74Vjs9Pxfl0CsUULlECmrN7T3Rz7RhTkPiDQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762442573; a=rsa-sha256; cv=none; b=yhkK7S6yc2BmVJBdNBOZhmiXFCNs0tlyU3ZBnwbj6LV+bQHCC08GknAWT4yp9Hf9lKyvZE t1TjQGlHAp7Y5UzRF/ajzO1h1fkorhxQHqB9w5U+i4HyqqV7hoZNNZO0UTLXuhN4/xRru8 aNsTt3py6dvxq1JiaHd8c3W907tNYoZQ2dqmf9PrZCCb0IkVf1MACery9LPFBaSGkUIoPj p23K+3DZJcP9ZCiIPYP8cqcLzpwVeaauczu/iASKr/pmEL57Asiz7pCxdrEpziUAX9n7ln /MzYkxJ58WDFoCCqpP6djbKaMHvkT9HMIHXNN9azLywzEcPYHyeJxKaFkdjTYQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d2QtP119Wz3l7; Thu, 06 Nov 2025 15:22:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A6FMrVI023383; Thu, 6 Nov 2025 15:22:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A6FMrMD023380; Thu, 6 Nov 2025 15:22:53 GMT (envelope-from git) Date: Thu, 6 Nov 2025 15:22:53 GMT Message-Id: <202511061522.5A6FMrMD023380@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Lexi Winter Subject: git: 0c90c9ad4649 - main - lib/googletest: Move to a new googletest package 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ivy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0c90c9ad4649789feec86c776674491c35cc7e27 Auto-Submitted: auto-generated The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=0c90c9ad4649789feec86c776674491c35cc7e27 commit 0c90c9ad4649789feec86c776674491c35cc7e27 Author: Lexi Winter AuthorDate: 2025-11-06 14:34:41 +0000 Commit: Lexi Winter CommitDate: 2025-11-06 15:20:52 +0000 lib/googletest: Move to a new googletest package gtest/gmock are not normally used by users unless running the tests, so they shouldn't be in the utilities package. Move them to a new googletest package, to match what we did with ATF/Kyua. While here, move tests dependencies from tests-all.ucl to tests.ucl, which is the canonical place for that. This change adds a new package to the system so, until we have a proper policy on how to handle this in release/stable branches, it should not be MFC'd. MFC after: never Reported by: emaste Reviewed by: manu Sponsored by: https://www.patreon.com/bsdivy Differential Revision: https://reviews.freebsd.org/D53607 --- lib/googletest/Makefile.inc | 2 ++ lib/googletest/tests/Makefile | 3 +++ lib/googletest/tests/Makefile.inc | 2 ++ release/packages/ucl/googletest-all.ucl | 33 +++++++++++++++++++++++++++++++++ release/packages/ucl/tests-all.ucl | 18 ------------------ release/packages/ucl/tests.ucl | 21 ++++++++++++++++++++- 6 files changed, 60 insertions(+), 19 deletions(-) diff --git a/lib/googletest/Makefile.inc b/lib/googletest/Makefile.inc index 231d7545f364..43ebace19a15 100644 --- a/lib/googletest/Makefile.inc +++ b/lib/googletest/Makefile.inc @@ -1,5 +1,7 @@ .include +PACKAGE?= googletest + GTEST_DIR= ${SRCTOP}/contrib/googletest GOOGLEMOCK_SRCROOT= ${GTEST_DIR}/googlemock GOOGLETEST_SRCROOT= ${GTEST_DIR}/googletest diff --git a/lib/googletest/tests/Makefile b/lib/googletest/tests/Makefile index 886b1a2fe49d..350e0fe765fe 100644 --- a/lib/googletest/tests/Makefile +++ b/lib/googletest/tests/Makefile @@ -1,4 +1,7 @@ .PATH: ${SRCTOP}/tests + +PACKAGE= tests + KYUAFILE= yes # Note: we start the gmock_main and gmock tests first since those take up to diff --git a/lib/googletest/tests/Makefile.inc b/lib/googletest/tests/Makefile.inc index 9691aaa93ded..8d19e1fafdea 100644 --- a/lib/googletest/tests/Makefile.inc +++ b/lib/googletest/tests/Makefile.inc @@ -3,6 +3,8 @@ # rather than installing all of them to /usr/tests/lib/googletest TESTSDIR= ${TESTSBASE}/lib/googletest/${.CURDIR:T} +PACKAGE= tests + # Clang's optimizer spends a really long time on these tests at -O2. Changing # -O2 to -O1 reduces the -j32 time for lib/googletest/test from 131s to 71s. # Using -O0 further reduces the time to 29s, and also reduces the disk usage diff --git a/release/packages/ucl/googletest-all.ucl b/release/packages/ucl/googletest-all.ucl new file mode 100644 index 000000000000..889e8a65f314 --- /dev/null +++ b/release/packages/ucl/googletest-all.ucl @@ -0,0 +1,33 @@ +/* + * SPDX-License-Identifier: ISC + * + * Copyright (c) 2025 Lexi Winter + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +comment = "Unit testing framework" + +desc = <