From nobody Wed Jun 4 20:59:06 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 4bCKgt3Sgjz5xd3L; Wed, 04 Jun 2025 20:59:06 +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 4bCKgt2lWWz3kXm; Wed, 04 Jun 2025 20:59:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749070746; 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=CT7QQNVuTWOXXMpEPv1v7LAE3nk/tNkbkpVUglt9FWo=; b=kwyzU3GcRD7j1x4G+XU6wJg5HNCA+cUpX5aiUkNdCeyIcbgQFCgIJTOBPuZrj052L6GJ9s che9f8TBBBJNiqCecOCMKeaEErrUWit4q5nlkA4kKshPQk9qKd6cEi8AM9Gqk/1EfzleuM HhBE+ReKabklbgaMuc+uI2UNsxCKnUxiCaqHpNKVB/IhCQ1NHWeE/qsE2myplMMObN4fZT WV+XW0Ufza+6j4EHW5goRLjXif8L/iIqaz/yAVWS8kOTJ50hi6VmWJ0Etc534hqKLjgUIF UUl+vMkNNpmXfV8gcEcRDhmuEMV6ALu6JRHdVrP6UxdpU9dk+VGayqyHAewTUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749070746; 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=CT7QQNVuTWOXXMpEPv1v7LAE3nk/tNkbkpVUglt9FWo=; b=AHuDMt4lheuf/ZMryz5kGoMfgbN3lVr+nk4JseQxQ2lIdQg5XTNMltugSX2gZD2g31KP8m fEIIlutYdSA2Dyc50Fl04MOurrS11+Yfz5JV4mtulh/nA6HHPLv4AspBXzEYtOdGBEDMkd KhHWlkAKbz5e0e08iD3lEK6gIbfLlbSq/EwO2ha5X0A/Yngf1HjATYzRSDyJmPFUzLtmqI bq8iisP3aLsSnk51jzmqZN7LRS50y0UnvISDpscbkTV+7hPjagtL76GnaNeN3GOk5EmReY CBOCisSsorJlXTPHF8iZgNkYGWU4dx6Ri4/iXUmn1lkN9V3Qn/Nj7yK1+IRTYQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1749070746; a=rsa-sha256; cv=none; b=An1N9FHSIGcF8Wx9G01ui7pKo00Hp5AycRUqgmkQitXT7vEzwW0UivPYx8Ot0z4xSfkpCr dy+of6rS+OinqqTKHlZ8pD899FFyxUYRrEa1wc0GXrEsIZFHZ8gTwKJZU35hWm5eOB541t zomv98XmThpMltLf4wiEp0LcjYmQbW57h18m3A+xjtZ0Gp2uAOqYMf4Sqj1Xv/nvpmMSpy SBQoAK6Yv75XpWNHGARxUZ81R23mrjl2czhQy74MJpkF+/IxolBBNdmDAi1/rskSLlNWTD 15+EsOOBjV9dSwqkQdOgC7qLZ2yhz3a3ppLqkDn4ys6tsFHtj2GIdrKobjWOoA== 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 4bCKgt28GHzgt0; Wed, 04 Jun 2025 20:59:06 +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 554Kx6Pd069438; Wed, 4 Jun 2025 20:59:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 554Kx65I069435; Wed, 4 Jun 2025 20:59:06 GMT (envelope-from git) Date: Wed, 4 Jun 2025 20:59:06 GMT Message-Id: <202506042059.554Kx65I069435@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: fdaba0128c17 - main - dtrace tests: Fix nits in some test programs 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fdaba0128c17ecb3d6e2a458bdc00a7b36a4da51 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=fdaba0128c17ecb3d6e2a458bdc00a7b36a4da51 commit fdaba0128c17ecb3d6e2a458bdc00a7b36a4da51 Author: Mark Johnston AuthorDate: 2025-06-04 20:52:16 +0000 Commit: Mark Johnston CommitDate: 2025-06-04 20:58:38 +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 --- .../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