From nobody Wed Jan 17 16:51:12 2024 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 4TFX2S6yrFz58BFq; Wed, 17 Jan 2024 16:51:12 +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 4TFX2S3dzCz4Lr8; Wed, 17 Jan 2024 16:51:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705510272; 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=Vhz6xkKm5k9hyWEzRNU/B9oGjOn1ywAndDUgnRo44P0=; b=uLKJdX0rwxlbYw0BL8W/c8UjbBgIG3Uju7RkXDwWTTu4OsMO+uFAQE9g39P1hesmJic0jz Tg+FJvqnIS/EmQ2ziwie0x6sLWT4KIj0K7X22HDybjZZjZcNxOE4/rA6qYcSwWa94B1aIp OofSoynixJO9xK4/qGIhDNPwhOf/F25szAZHePPAp99Ze4QmtJB60zGJd/e0MXRbNBo/Al bDJB6ZoyE+jJdDDzlNXkEN1jr1h4nQ/awZPPFcQnu6YeE2lbkSmnwa9W5bpQd99JrCsPK3 uehDOlDajrCbjM2VeIBhtpACHDcMEjFH/NGNj6v+81/XUZNqFZ99pKUxXm6AuQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705510272; 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=Vhz6xkKm5k9hyWEzRNU/B9oGjOn1ywAndDUgnRo44P0=; b=Y1gvwnUH58iL5Xr2geUA6mrFpj7VeN+cL/6a1UCwxVX1mo9j1nCE2zbdjktOIpe64CCVk6 1xlbGOpgduGBFbDmHkgUhJdS3XOno6WAKQGt9mBkaaefyhNoqrRAxBTN+sVfgMxnUkpU84 E1Jd2cJhTTQLhOfQIY+frrDX30qzkoXyhIccNffrBsbq0pbnrFtcBTszLNURouzggYwbWL ZzmERIEvdgOnd7AE7ILfXR2MZikwG79mPAXK4hGifbZFqZ54jF8/mn/f76ggR4490KZA8s vtzGbQrVX26GlEOA2Gr1hEGAZm/MBXo+vC1Gcsh3xWIHZmBM6iH7fL6Gr49oAw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705510272; a=rsa-sha256; cv=none; b=dX03dXd9Z4MXV5ju8evXfkdy3+M6ZtuNXMvm6Y8TZiJBFx0qFXnTea04iVu5uSX0N5CDmg +SSr2o6aQ2PDHjZx8yu5Bvg0Y8qsihCm9gcZB0s1k5Ime4E6KPwI7522RvXte9r8KPGrx+ zQmp1xD6RrRvxE/K3HkKds4AUW4MPW8fwgIVf8lpGsSeuTPE6P1RYJM/5PiRkOSaXbqLWx QI5Vf+Rcr3806aHvuQ1HJIifh4IqBqNVsWXTWsOHN8WHnDzA10l2gOmxi6hVa9od+QFV7J 5PNP6mYNwZbIkMjQwACQlRqZDH1vGklsxNKJlphqBjLhf0Aywth14c1bYz5dUg== 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 4TFX2S2kRfzXNK; Wed, 17 Jan 2024 16:51:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 40HGpCl0002802; Wed, 17 Jan 2024 16:51:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40HGpCTQ002799; Wed, 17 Jan 2024 16:51:12 GMT (envelope-from git) Date: Wed, 17 Jan 2024 16:51:12 GMT Message-Id: <202401171651.40HGpCTQ002799@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: bde22cf630ab - stable/14 - dtrace tests: Diff expected and actual output upon a miscompare 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/14 X-Git-Reftype: branch X-Git-Commit: bde22cf630aba34c65583291cd72ce0afad79ffc Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=bde22cf630aba34c65583291cd72ce0afad79ffc commit bde22cf630aba34c65583291cd72ce0afad79ffc Author: Mark Johnston AuthorDate: 2024-01-10 21:38:30 +0000 Commit: Mark Johnston CommitDate: 2024-01-17 16:50:57 +0000 dtrace tests: Diff expected and actual output upon a miscompare This makes quick diagnosis of test failures easier. MFC after: 1 week (cherry picked from commit a61d2c7fbd3c87126db93dfe83b9f96fea3156f8) --- cddl/usr.sbin/dtrace/tests/tools/dtest.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cddl/usr.sbin/dtrace/tests/tools/dtest.sh b/cddl/usr.sbin/dtrace/tests/tools/dtest.sh index 83f7a6c875da..d2f3dc4ed8df 100755 --- a/cddl/usr.sbin/dtrace/tests/tools/dtest.sh +++ b/cddl/usr.sbin/dtrace/tests/tools/dtest.sh @@ -119,6 +119,10 @@ test stdout: -- $(cat $STDOUT) -- +test stdout diff: +-- +$(diff -u $EXOUT $STDOUT) +-- __EOF__ fi if [ $(stat -f '%z' $STDERR) -gt 0 ]; then