Date: Mon, 2 May 2022 15:02:40 GMT From: Tom Jones <thj@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: c1c381eb7f82 - main - diff3: Remove test case that references non existent test files Message-ID: <202205021502.242F2eB5017164@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by thj: URL: https://cgit.FreeBSD.org/src/commit/?id=c1c381eb7f82ecfec24b56c96c216dd160f2e3ea commit c1c381eb7f82ecfec24b56c96c216dd160f2e3ea Author: Tom Jones <thj@FreeBSD.org> AuthorDate: 2022-05-02 15:00:44 +0000 Commit: Tom Jones <thj@FreeBSD.org> 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 }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202205021502.242F2eB5017164>