From nobody Wed Aug 03 00:39:11 2022 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 4LyCfR6Kk9z4Y40B; Wed, 3 Aug 2022 00:39:11 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LyCfR5gVcz3Vqb; Wed, 3 Aug 2022 00:39:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659487151; 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=fMnQar1pkqS/NzEdHobqHr5i251MVTNXfXTXPTDl92w=; b=dvNWmgS8pGoVoAQTfk9pzHousk3wsEu8SZY/EzF5Nu1wev909Urw2K+Q5kXY3qExEPofd0 YTHD3sOc8YgEScZ8fkbD/tNirAFTVasAQDKvmmO5zG9a1mLsRNs9O4KcYCXt9DKPANgztE 9l3gUw73ybjGPSanbOejudT2wO1qo6wX0bzORHu2AL5O37HVSL2ap0ynEDWC8eHIRt0Q6v gLAg67xUOhBOkCb73GqZIYDBEGO73uoB1GiDIJgN4ETqH018DZHT1yfdxnLC7pm5riPyfi 0MCa9LA7UV/acjhsKnRq6P3yNCa3oD5YWPfZtW5yv4t6pWo3UZa44uS4/nzX6g== 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 4LyCfR4mjTzXyB; Wed, 3 Aug 2022 00:39:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2730dBRS016830; Wed, 3 Aug 2022 00:39:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2730dBJS016829; Wed, 3 Aug 2022 00:39:11 GMT (envelope-from git) Date: Wed, 3 Aug 2022 00:39:11 GMT Message-Id: <202208030039.2730dBJS016829@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: 6a05f1438145 - main - dtrace tests: Rename some test type names to avoid a conflict 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 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: 6a05f1438145c2d8c3d0e29e1d5e24a05d394453 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659487151; 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=fMnQar1pkqS/NzEdHobqHr5i251MVTNXfXTXPTDl92w=; b=X1PtAIv18lwvsRpV7wXwqvucyRkX3iZ9mO1M87fXCENtrXN4ISA81xz4tHygWOWKiq1rYP k6wzS8LahmucJySSVGR4pNSvhLB1GQE6MZUtt2Y2PiVih8etlXSG/ySRPSxXVnGBNlqBO/ Ed2GJG2v3GVM5KJnY1EeuopwmEcZvl4qb/K20+524NkvmdeVKjVofGXvI22dI7p+yJBsgm +m9//g2hQQzI/j7owD185soYzc6iL8dnzYrG4RBrKMuvoHGswf33C0ZKGGATymoIhch9XP F6L55bT0fGkjyRDDiz0820czt8pWKw8IgT2oJb8G9sWYPCkb0oVflIMfXdX6zw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1659487151; a=rsa-sha256; cv=none; b=Mw+cAU0017fHi7SKCcjmhW3xYGB50dscQ61uzBAWA8xKrKyQ+VceVaf7w7Q6EtMvPqmIiF jyLWdtpErPoHx6cMrUz9ahyZhkSRp7ScexgPzmVFOqqsNSNCD0sPkPX8Z2+bbQgwISY3AP KhkySNfmGW+YKssaR0Gpe8BGyxFHO/Q79zRpf9I81TipQCgeipHw79O+KIrluKtNNTSHKv N779rmbs/nXEZK2algzTWRuTzIABPXRMDl91K+Fsuxea/GK9xrhQQES11uvZAZLOTGcEyo qkBglu1zkzo5QzbO7CYiFd7WECnuaOJJxOeHy3L8/SUjVnADRK9aQ4f/q4zWeQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=6a05f1438145c2d8c3d0e29e1d5e24a05d394453 commit 6a05f1438145c2d8c3d0e29e1d5e24a05d394453 Author: Mark Johnston AuthorDate: 2022-08-03 00:32:08 +0000 Commit: Mark Johnston CommitDate: 2022-08-03 00:32:08 +0000 dtrace tests: Rename some test type names to avoid a conflict MFC after: 1 week Sponsored by: The FreeBSD Foundation --- .../test/tst/common/translators/tst.OutputAliasTrans.d | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/translators/tst.OutputAliasTrans.d b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/translators/tst.OutputAliasTrans.d index cd4715319913..c6bfff2181e6 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/translators/tst.OutputAliasTrans.d +++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/translators/tst.OutputAliasTrans.d @@ -37,23 +37,23 @@ #pragma D option quiet -struct input_struct { +struct dtrace_input_struct { int ii; char ic; }; -struct output_struct { +struct dtrace_output_struct { int oi; char oc; }; -typedef struct output_struct output_t; +typedef struct dtrace_output_struct dtrace_output_t; -translator output_t < struct input_struct *ivar > +translator dtrace_output_t < struct dtrace_input_struct *ivar > { - oi = ((struct input_struct *) ivar)->ii; - oc = ((struct input_struct *) ivar)->ic; + oi = ((struct dtrace_input_struct *) ivar)->ii; + oc = ((struct dtrace_input_struct *) ivar)->ic; }; BEGIN