From nobody Wed Jan 10 23:32:57 2024 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 4T9PHG0Wkjz56T44; Wed, 10 Jan 2024 23:32:58 +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 4T9PHF3Ll2z45tG; Wed, 10 Jan 2024 23:32:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704929577; 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=RmZ+BikW8IZpw4jwlJFqxHP7OFB45ah08i0ZymzMKos=; b=UU7vceGTIqqXSFs2T3AY4HQbJxUKAIEpIFLdsK+1W/str+NcIAlD1clOe+g87zhv+iKFbS 4n3bmxKgWaCPp7na+Tyro+bUJemyvRSFkDzxxHfe7sdxCL4HLxntp+QsvgHx++NgreNALA TpFwSIw0xLuPM9NJ3RNQUeiH9URbkAQySapeR//Xxlg4RwkQh4igLNe4tgtE/O2SK3n8hJ 2mT2S6bOLxE2TkUttX12Q0EZM5ETPONE/dsuttbfbfFfKIpBVN6oviyH8xzlXnyye45jeA 005EtklIpEpi5h6Ks9ymBVSifqCEJV++Z5RJsK2f2jQ5aOUKq89PS24DXlkCKw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704929577; 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=RmZ+BikW8IZpw4jwlJFqxHP7OFB45ah08i0ZymzMKos=; b=wX2mi2nhSxp+YP7TCCQePK4NzdWcHkx7IZkSNU8oCIn4qIGyCND/fEx71BDy/NnuRZ30Sg kTw44mLHrcfOFN9eVWRnwQ36QC2XN0q8hCK8txIVsci0lx5e2Px3PYi6aPKr3hc6WHx9wi kl1b1S3oFEpPIc1KzAKU1iELK8AXu634oVEO+engE8NdqRCqwW+z5l3EV8ZtPLL0VLU3nk 9XsCCCOsIftWJNZoMVwYsQ4yLhLWsrI+WoC56SZ7EwEk4WHWOPc0gB/TSaxpHOLMB3uzRA NOrrmSfEsONupf+c54ZXsrq8fkoEUuSZKIX4nJ+juD+cxb5Zj0Sm/ZmZ/CQM3A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704929577; a=rsa-sha256; cv=none; b=me6raJPi53bdd+RudT6pc8VnP+7/ju27bk+CwnK5gO4Tz0U4dSAcGmCtUZTRYJ3q4nBfVN AXpo4cXMgrS1Mstp4LCKJ8+EvQx1droxAB/QnF0wICZ+WR4xl74o5Y0pBHjX0A+EzydzTc jyaxQ3/x8W/3C7tK235RieEsj6R4fomhilaUaTl2wsNxGH8j6d9C/5KqNGyzbORYTPze5O GhbBa7f2j3rF7d4lnKvfsN77XxZDN69tvZ8ix5Sv/LTJT8c17qUUMXyZdm1mACxQlmT2oQ JsP2WXHSBxRVMaMhp/1+Pk8VVyNMZUkJ1BVJKEyXoVD4avL7dmklKRZKZAlFmA== 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 4T9PHF2GJKzvv3; Wed, 10 Jan 2024 23:32:57 +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 40ANWvFp098136; Wed, 10 Jan 2024 23:32:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40ANWvcu098133; Wed, 10 Jan 2024 23:32:57 GMT (envelope-from git) Date: Wed, 10 Jan 2024 23:32:57 GMT Message-Id: <202401102332.40ANWvcu098133@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: a61d2c7fbd3c - main - dtrace tests: Diff expected and actual output upon a miscompare 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: a61d2c7fbd3c87126db93dfe83b9f96fea3156f8 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=a61d2c7fbd3c87126db93dfe83b9f96fea3156f8 commit a61d2c7fbd3c87126db93dfe83b9f96fea3156f8 Author: Mark Johnston AuthorDate: 2024-01-10 21:38:30 +0000 Commit: Mark Johnston CommitDate: 2024-01-10 23:19:36 +0000 dtrace tests: Diff expected and actual output upon a miscompare This makes quick diagnosis of test failures easier. MFC after: 1 week --- 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