From nobody Thu Aug 11 14:36:23 2022 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 4M3Trl5Zrfz4Y3CC; Thu, 11 Aug 2022 14:36:23 +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 4M3Trl3qKJz3Pqr; Thu, 11 Aug 2022 14:36:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660228583; 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=rYz48qV4Ym/39QfXBpjLNJE9bsjTtO76M6VINRWJNSs=; b=vEJYbGhLbVSOJS288gCFwJcNUrAlSTPntvpqL+wNGBIgFi7QtKIlubODbS9rVbDRpiNV98 AjDYbyq7KhcZqjfnXJi535XcM4f+ZqG7IXCsZu0AwytozRcVPR9pMETVftxvjWo7B6O7Od mBxVD6MjzsF4/YiaAIs+T+uDAnPP89DODU/v5HVQZFzdFzHUDORqQktVpNHeiuUI48MSGr mwl/BxT3XSxQBP2FNHq1qeNX8RYOwZ41NGnRy9GiqPlsi3dV+cKsxrqZCDXyphpBfqMtvu VRRT0cw28Lei3aMLDgDp/l0cOd5XI+lyxoQs15T+Y64XwKBF1q8Cm3dPPj33GQ== 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 4M3Trl2rGPzvVV; Thu, 11 Aug 2022 14:36:23 +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 27BEaNGK005204; Thu, 11 Aug 2022 14:36:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27BEaNK6005203; Thu, 11 Aug 2022 14:36:23 GMT (envelope-from git) Date: Thu, 11 Aug 2022 14:36:23 GMT Message-Id: <202208111436.27BEaNK6005203@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: 28ceed5f7aa1 - stable/13 - dtrace tests: Rename some test type names to avoid a conflict List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/13 X-Git-Reftype: branch X-Git-Commit: 28ceed5f7aa1d97324b12344c3d9cd6f2b0a2460 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660228583; 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=rYz48qV4Ym/39QfXBpjLNJE9bsjTtO76M6VINRWJNSs=; b=WdbwF5TO9YcFwpu93mwk5eAazeTK69zYUHna41UURha/0IiwS+Z0VNADT6UtMPnsJaycHb lyRXlB4oTQha+jy+h4tiETa4AtO0ziEQIO08Gty5RsYvPOsKbuxsXxY0m8QK+F+pZVe+8n 18JzZhT64hOLzNqVBlgMQ5gpiZdsIVal1nMrrrPh0DVMfYYH2gp84DPB6Z/Ytj7RnZh6eK OAs5IGMqv5iu4OBs1bn4zkx9/g9B9T6VKL5mvI7NDgdyWow+JjjHMHEuPvnA9sAwzMXiP4 s/potV7YIorHyqQl3WdoFSsPQyq+VoGXeaTSZoTeLqb0BuLxTIWcdZPjpTvTAQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1660228583; a=rsa-sha256; cv=none; b=pqFb3HJvFORfcdc50QohOoD62Ey6eYcw4E3AQhxAY1d+OaJaZ2eh7G7JzE340FVEffhJEl QRb3XnNeF5Z7ANVy1pCNcmLHMLHOsMPRXv7SCv6TpTClxbpikh0WH7Oi+L8kqDQm+4ZJaT Jg92oIFHE11QwXEhBHXckHJLUM0cULhEdCr5K66AOLHLqiYlHWPI9dXNNMEl485ZKgfHbW LlFe5epzElrgvAFeMANvffsNuSPkoQR9YzNLlk4TKp2nJUmT+vep7KQ0szTFnrqOh2SN4y L0LvVwxPUMntbWIQCtigykfncOR4FxrWS/t+xZ4J46z3r65UBy2RkUsI/Zpo+A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=28ceed5f7aa1d97324b12344c3d9cd6f2b0a2460 commit 28ceed5f7aa1d97324b12344c3d9cd6f2b0a2460 Author: Mark Johnston AuthorDate: 2022-08-03 00:32:08 +0000 Commit: Mark Johnston CommitDate: 2022-08-11 14:36:11 +0000 dtrace tests: Rename some test type names to avoid a conflict Sponsored by: The FreeBSD Foundation (cherry picked from commit 6a05f1438145c2d8c3d0e29e1d5e24a05d394453) --- .../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