From nobody Thu Oct 29 23:32:54 2026 X-Original-To: dev-commits-src-all@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 4jG0s254rGz6xqTv for ; Thu, 29 Oct 2026 23:32:54 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jG0s21y6xz4qDZ for ; Thu, 29 Oct 2026 23:32:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793316774; 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=e9Z1ICVQ/vpD9DQn+PhLju+I+bn4RYW3A+lvBAfXdEA=; b=yoywXLEqpBDBHQGCuOMZ0BcGrAGy4ct/7QG61fI/cjMXw1PTf1Cu2W4eEhs7EWsh2BvSuk EMlqx1Ux3lXPdbjPTqmJpEB0lkky94aYzwke5RHPt9lMZ8ImkbgJqi+B5/mwfas7movVN9 pHzgFzNQfhPiz5WTR3wADnB29GIGi7w5RK0zlgECngyRAX2I42Sc4cKrIlWS9uVj7EfR1I GHPTiarrgkTgv6KPIO/8kuvFOhTd3r0hman2viRVwk55q5wHCqLwTqN4WCSOhUJf10V/hA keJ+ZEdWSTUGHyF8371tbDbApziKIzRL2YD2auuKhBNQ0s29418SgI1xoO59Cg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793316774; b=iXKuwh508jW+jeT+m2VDTAv+1QgxNmdJqsa3g0nltENqJGg9+0rLOkwQAebqD4hu+8Ueo4 2AjUqgC8989Al4aO2tBrBNujv7MXkrFmMJe2OXM7Ipk0XTU5xcBefYUseBNzl5UxWfIPBg EIXlANw/+3v2PUTtVrOQqP9GvADmdaR+r7dbN2t+mbaEo/os6f77c4qkU7FUQb64/vLlbR ZjmBHx7t1RwBCjua0sPc4Kw2OZIPQ45xQubCDAQ/Sbuxey/mBrvawdcfIIe3AzwoL+YWb2 NxkBBavDle1Vcv1Y+CEgp8jvt19lPqf2q1VnA0qxCRGZ+d09agEAFVjSLVG2Aw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793316774; 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=e9Z1ICVQ/vpD9DQn+PhLju+I+bn4RYW3A+lvBAfXdEA=; b=fTdhTFnOWV/6V349vFu16VWje/7gPNtFQx3BBQfHWhDuxpA8fMXyj8FdLVEEDSSXcaREuv GO2DDA7m6ByIW/O1J4KnwQ9p09GkSdpZEofRriBrj/KyxbPQnyJ3mClshzWaCFAn2pQRf8 369h2kwBoh7YPozk0vY+8I9Pb24rbq+59/Ze1zxclc0VBDD+Ij1ldKNY7mQaLkrr2L4jjA VFK+J3i0nHoScpczNLlFgzv39RIkLf3FQnYQbi3L9RLam0EruN4AI+ulTHXOZoH0LC2bPs rUdoTtOExRiZuJ4vtVixf2oi1enimuOwzEUvOCB5jS5DLiizyVI+dSBqMCyRyw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jG0s21ckCz12CR for ; Thu, 29 Oct 2026 23:32:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3ab51 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 29 Oct 2026 23:32:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Enji Cooper Subject: git: eecc84de3572 - main - GoogleTest: run several tests as plain C++ tests List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: Commit messages for all branches of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ngie X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: eecc84de3572d1ee6caac1fa14dd3140c9601c9c Auto-Submitted: auto-generated Date: Thu, 29 Oct 2026 23:32:54 +0000 Message-Id: <6ae3d7a6.3ab51.6df88b4b@gitrepo.freebsd.org> The branch main has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=eecc84de3572d1ee6caac1fa14dd3140c9601c9c commit eecc84de3572d1ee6caac1fa14dd3140c9601c9c Author: Enji Cooper AuthorDate: 2026-10-09 21:33:50 +0000 Commit: Enji Cooper CommitDate: 2026-10-29 23:32:31 +0000 GoogleTest: run several tests as plain C++ tests Some of the tests provided by GoogleTest don't play well with the kyua GoogleTest engine available in 0.15.0, in part because they test edgecases that the kyua GoogleTest engine does not expect or handle gracefully. Treat the tests as plain C++ tests to keep parity (result-wise) before switching the testcase type from `plain` (what it is today under the covers) to `googletest`. MFC after: 1 month MFC with: 3fb03fb35b20 ("[tests] switch GoogleTest tests to ...") --- lib/googletest/tests/gmock/Makefile | 3 ++- lib/googletest/tests/gtest/Makefile | 21 ++++++++++++++------- lib/googletest/tests/gtest_main/Makefile | 17 ++++++++++++----- 3 files changed, 28 insertions(+), 13 deletions(-) diff --git a/lib/googletest/tests/gmock/Makefile b/lib/googletest/tests/gmock/Makefile index 493567100630..6ac12d2814d4 100644 --- a/lib/googletest/tests/gmock/Makefile +++ b/lib/googletest/tests/gmock/Makefile @@ -2,7 +2,8 @@ .PATH: ${GOOGLEMOCK_SRCROOT}/src ${GOOGLEMOCK_SRCROOT}/test -GTESTS+= gmock_stress_test +# This doesn't work with the googletest engine in kyua 0.15.0. +PLAIN_TESTS_CXX+= gmock_stress_test LIBADD+= pthread gtest gmock diff --git a/lib/googletest/tests/gtest/Makefile b/lib/googletest/tests/gtest/Makefile index 5834ca788985..691dd5ce25ff 100644 --- a/lib/googletest/tests/gtest/Makefile +++ b/lib/googletest/tests/gtest/Makefile @@ -2,14 +2,21 @@ .PATH: ${GOOGLETEST_SRCROOT}/src ${GOOGLETEST_SRCROOT}/test -GTESTS+= gtest_environment_test -GTESTS+= gtest_no_test_unittest -GTESTS+= googletest-param-test-test GTESTS+= gtest_premature_exit_test -GTESTS+= gtest_repeat_test -GTESTS+= gtest_stress_test -GTESTS+= gtest_throw_on_failure_ex_test -GTESTS+= gtest-unittest-api_test +# These test scenarios are't handled properly with the googletest engine in +# kyua 0.15.0. +PLAIN_TESTS_CXX+= gtest_environment_test +PLAIN_TESTS_CXX+= gtest_no_test_unittest +PLAIN_TESTS_CXX+= gtest_throw_on_failure_ex_test + +# NOTE: these tests rely on testing by side-effect with global variables/state +# used in multiple testcases. +# +# Running this plain C++ tests gets around that problem. +PLAIN_TESTS_CXX+= googletest-param-test-test +PLAIN_TESTS_CXX+= gtest_repeat_test +PLAIN_TESTS_CXX+= gtest_stress_test +PLAIN_TESTS_CXX+= gtest-unittest-api_test CXXFLAGS+= -I${GOOGLETEST_SRCROOT}/include CXXFLAGS+= -I${GOOGLETEST_SRCROOT} diff --git a/lib/googletest/tests/gtest_main/Makefile b/lib/googletest/tests/gtest_main/Makefile index de9bc2f4a78a..517ec804692a 100644 --- a/lib/googletest/tests/gtest_main/Makefile +++ b/lib/googletest/tests/gtest_main/Makefile @@ -3,8 +3,6 @@ .PATH: ${GOOGLETEST_SRCROOT}/src ${GOOGLETEST_SRCROOT}/test GTESTS+= googletest-death-test-test -GTESTS+= googletest-filepath-test -GTESTS+= googletest-listener-test GTESTS+= googletest-message-test GTESTS+= googletest-options-test GTESTS+= googletest-port-test @@ -14,10 +12,19 @@ GTESTS+= gtest-typed-test_test GTESTS+= gtest_main_unittest GTESTS+= gtest_pred_impl_unittest GTESTS+= gtest_prod_test -GTESTS+= gtest_skip_test -GTESTS+= gtest_skip_in_environment_setup_test GTESTS+= gtest_sole_header_test -GTESTS+= gtest_unittest + +# Crashes when listing testcases using googletest engine in kyua 0.15.0 +# (probably test bugs). +PLAIN_TESTS_CXX+= googletest-filepath-test +PLAIN_TESTS_CXX+= googletest-listener-test +# These test scearios don't work with the googletest engine in kyua 0.15.0. +PLAIN_TESTS_CXX+= gtest_skip_in_environment_setup_test +PLAIN_TESTS_CXX+= gtest_skip_test +# Some of the test scenarios show up as "skipped", when in reality they're just +# testing skipped functionality. Don't inflate the testcase numbers +# unnecessarily as it can serve to confuse downstream users. +PLAIN_TESTS_CXX+= gtest_unittest CXXFLAGS+= -I${GOOGLETEST_SRCROOT}/include CXXFLAGS+= -I${GOOGLETEST_SRCROOT}