From nobody Fri Jun 20 13:52:30 2025 X-Original-To: dev-commits-src-branches@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 4bNzSG3xTBz5y44X; Fri, 20 Jun 2025 13:52:30 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bNzSG1Mvkz3Xng; Fri, 20 Jun 2025 13:52:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750427550; 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=9GLdpyV8OVTs010eRkPFkoWDO/hItFsEbAIat8vejIY=; b=TksLGzqN5LKjwxDz/jDcaB3JucXRJUdOJEajmJi0D1HaTzyb1/l4gjdibdgiByqkh5BD9E d8T3RyVnKns49uYbnWduuOPKuYsd+szbQGPD6VS6wE86Srd73nrGAcqI3PFIKuqMxih4VZ gZ471nFbEqnLQFASDvKzto52gVrHog/hzyAPPfiMAPGK52AZXKe8PG5yjswAOZNxzQKURq R1NVs47cPrhSU/Q/ExoW5cfXGzxalI+S5azK/afd7poNg16xudOr9/TfquiEjExK/SA3wq 7nQoSdfggV3MUCBhA2oPOaDVIzN6wPnmshr9MtAMe0M/+WI/Ed/ceEDn2itIiQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750427550; 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=9GLdpyV8OVTs010eRkPFkoWDO/hItFsEbAIat8vejIY=; b=UHCuMh/9zLa8KZNSAznxyUQvNJTtau/kyvaKg+NF0Gub9AGg2Tuck5Jheiou0LySOyNtw/ B4AAilN1zC9JST6Q9mmViqtv8MDxQoWHgtZBJVvKCAfuwlaYdTEDlPGI/yUDl1KqA0dBrf hdrRtpcTVNNSIRLPPmLicvgi6GSe2sGYL4iUj6IuHMJexMh4+TwI0psH3tae0gt8AjFNzY O8I1CAGOM0lEOVCOw0J6v4fWa7w171VRNXq8mLNAueXUmrJiQ8muSCoHuGvTWlr8juhaVs f53mV982SRT+XbkmIipM6p4O81Cq/twmzKjnUe94Y8TQyJsD9Eb97spGQwO9ZQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750427550; a=rsa-sha256; cv=none; b=X+eIw1K8FO8/6FxDIoc9MsicDBBa7rL+yYYD6ZsBmioqqEWIWiaJjEtUoS7FwXeXX0qf6P 2qvdaNcs/oWBteBoBgAoCN5dh/ugjzUCFwXR7xFphiGyR22Fq87XXe3C502GAvVzNUmt2E s+fwaAo3qYz9zqUmJrcqPq/qiTWe2ddzhjVwsq6JFPSbS37aFBpVFL/fu39K6SvOMWGr0C SBA8kns4k69uSYoQPdK2r5mLvuFPNVcQbBPMQupjkulGP6BTWs693ru7Qxh/NIBG41AHPg f6Lxgb10+hefM0G2LcC6aioZI1pNA/7fwWzfkI2jf/mRMU/lnw9Zdy+3ctO1wA== 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 4bNzSG0zS7znCw; Fri, 20 Jun 2025 13:52:30 +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 55KDqU2M058264; Fri, 20 Jun 2025 13:52:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55KDqU7A058261; Fri, 20 Jun 2025 13:52:30 GMT (envelope-from git) Date: Fri, 20 Jun 2025 13:52:30 GMT Message-Id: <202506201352.55KDqU7A058261@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: b089e3135685 - stable/14 - dtrace tests: Fix nits in some test programs List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b089e31356855b7a64ac31218481b0d67b286821 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=b089e31356855b7a64ac31218481b0d67b286821 commit b089e31356855b7a64ac31218481b0d67b286821 Author: Mark Johnston AuthorDate: 2025-06-04 20:52:16 +0000 Commit: Mark Johnston CommitDate: 2025-06-20 12:47:27 +0000 dtrace tests: Fix nits in some test programs Otherwise these tests fail spuriously, depending on which compiler is installed as cc. MFC after: 2 weeks Sponsored by: Innovate UK (cherry picked from commit fdaba0128c17ecb3d6e2a458bdc00a7b36a4da51) --- .../opensolaris/cmd/dtrace/test/tst/common/usdt/tst.multiprov.ksh | 7 ++++--- .../cmd/dtrace/test/tst/common/usdt/tst.sameprovmulti.ksh | 5 +++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.multiprov.ksh b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.multiprov.ksh index 9620b97cb019..c8f0d1e5f8c0 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.multiprov.ksh +++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.multiprov.ksh @@ -40,8 +40,8 @@ echo '#pragma D option aggsortkey' >> test.d cat > test.c < -void -main() +int +main(void) { EOF @@ -52,7 +52,7 @@ for oogle in doogle bagnoogle; do #include void -$oogle() +$oogle(void) { DTRACE_PROBE($oogle, knows); } @@ -79,6 +79,7 @@ EOF fi objs="$objs $oogle.o $oogle.d.o" + echo "extern void $oogle(void);" >> test.c echo $oogle'();' >> test.c echo $oogle'$target:::{@[probefunc] = count()}' >> test.d done diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.sameprovmulti.ksh b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.sameprovmulti.ksh index 2e404f4b8df6..4dd54f3fb633 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.sameprovmulti.ksh +++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.sameprovmulti.ksh @@ -35,8 +35,8 @@ cd $DIR cat > test.c < -void -main() +int +main(void) { EOF @@ -74,6 +74,7 @@ EOF fi objs="$objs $oogle.o $oogle.d.o" + echo "extern void $oogle(void);" >> test.c echo $oogle'();' >> test.c done