From nobody Mon May 02 15:02:40 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 6CBB61AAD0D1; Mon, 2 May 2022 15:02:40 +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 4KsRCh2XVCz4Xgr; Mon, 2 May 2022 15:02:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651503760; 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=Cs2SWlbP2d9GJQesuNnn1AD1w/FV9c2iD6ihfS9xGXk=; b=CmFh3koh0oZXhn3N0qG5rG3W0QIE85gDdGWqn8sVl+vy9bsN2WyN2ttSLOMNMdVM0My2sw bFoNvlyWGDns3CsxhjvyV/2CfcBXJbJRXOdGv/ak727WkpXH939oMbUWrQzWajnHeabhec U39uhshB3qkv7F0ProaPHuhQ+NDTcZk1RLkTJ5EoVhFgJxpd6WW/BG85RONubYfVG0Ky/Y 8XhSAks6WOGP5/GN2rGfbOHxp6jF4YV3Z/XTofxNB4mmp54Pgrq55FMR7VnZFnq+2M33dc 1/MgeH99cJq0d/0x1Jsw16oJKxNXIdawP1kpSHM0SZUBAZuLajQ2cjY1NeAYrA== 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 36BDA43A1; Mon, 2 May 2022 15:02:40 +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 242F2ecM017165; Mon, 2 May 2022 15:02:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 242F2eB5017164; Mon, 2 May 2022 15:02:40 GMT (envelope-from git) Date: Mon, 2 May 2022 15:02:40 GMT Message-Id: <202205021502.242F2eB5017164@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Tom Jones Subject: git: c1c381eb7f82 - main - diff3: Remove test case that references non existent test files 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: thj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c1c381eb7f82ecfec24b56c96c216dd160f2e3ea Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651503760; 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=Cs2SWlbP2d9GJQesuNnn1AD1w/FV9c2iD6ihfS9xGXk=; b=fFl8FwcStjs9wVsm3HSIcgL5froN1Yy3y2ybFeTDQ/1pP8dV2jP/YQi/ey93FCPi0pBMhQ h1xSbtyUcB7ussbYZQEWln7zND89rzLCiWYBUcrBT8hhJzf7MeAbk40bP5cVEgUTqRWOI6 F4f0M6NT/S+NoZoKEgEtJr0lk9uHC9XhN7yreZVaI4mVqpH7IyEi4y7tVTuFhzZUrQSd+K QrIssgcSPbfpc7XWSGPf84F+k+j8u4ozRVuDyKyt53aoLmLWRr6BBy/4LceqlB5oWR1RuH EqNtKAhDhikHdsY6gANrkdaekEjdbmdNVKVEwZp32lf2ZRh7Nv1Dgz67Gp3d1A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651503760; a=rsa-sha256; cv=none; b=HdnaORzyIKtXw6bUsZbO9P23H5lff1WIPyMn2dR6yWteMV/yL/OLkK0o5DNexVnNYdZUy6 FsbxHwTnhARAYma61P3Wz+3z9PYVxV4wM8Xu7Ebj64IFob2ru28AEdyI6MgJhRZfln3vJY rW2PHoveqUHhDyNJZh8AV2rhuoAeJBFLSaffifiGqBJJCG7jr8jbxCelsgPjyHX0Ja6waO ksztbGMlHfBOuclC4qVGz5pG8L7qAkGBqqyVD2VYvKpMJUS/569hvLxVARG3ghPsGH2j0D vNtoZNEz9bcuBwy2wsMsnuUpeUQH863YbnmfWfRAOUMVcR4VV39tKBudjiLY9w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by thj: URL: https://cgit.FreeBSD.org/src/commit/?id=c1c381eb7f82ecfec24b56c96c216dd160f2e3ea commit c1c381eb7f82ecfec24b56c96c216dd160f2e3ea Author: Tom Jones AuthorDate: 2022-05-02 15:00:44 +0000 Commit: Tom Jones CommitDate: 2022-05-02 15:00:44 +0000 diff3: Remove test case that references non existent test files Sponsored by: Klara, Inc. --- usr.bin/diff3/tests/diff3_test.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/usr.bin/diff3/tests/diff3_test.sh b/usr.bin/diff3/tests/diff3_test.sh index c30f258128af..37a493cfefd5 100755 --- a/usr.bin/diff3/tests/diff3_test.sh +++ b/usr.bin/diff3/tests/diff3_test.sh @@ -62,8 +62,7 @@ diff3_merge_body() { atf_check -s exit:1 -o file:$(atf_get_srcdir)/9.out \ diff3 -m -L 1 -L 2 -L 3 $(atf_get_srcdir)/1.txt $(atf_get_srcdir)/2.txt $(atf_get_srcdir)/3.txt - atf_check -s exit:1 -o file:$(atf_get_srcdir)/tao-merge.out \ - diff3 -m -L lao.txt -L tzu.txt -L tao.txt $(atf_get_srcdir)/lao.txt $(atf_get_srcdir)/tzu.txt $(atf_get_srcdir)/tao.txt + atf_check -s exit:1 -o file:$(atf_get_srcdir)/long-merge.out \ diff3 -m -L long-m.txt -L long-o.txt -L long-y.txt $(atf_get_srcdir)/long-m.txt $(atf_get_srcdir)/long-o.txt $(atf_get_srcdir)/long-y.txt }