opnsense-src/usr.bin/diff3/tests/Makefile

# $FreeBSD$

PACKAGE=	tests

ATF_TESTS_SH=	diff3_test
${PACKAGE}FILES+=	\
	1.txt \
	1cr.txt \
	2.txt \
	3.txt \
	long-m.txt \
	long-o.txt \
	long-y.txt \
	1.out \
	1t.out \
	2.out \
	3.out \
	4.out \
	5.out \
	6.out \
	7.out \
	8.out \
	9.out \
	long-ed.out \
	long-A.out \
	long-merge.out \

.include <bsd.test.mk>
Import working progress BSD diff3 import bsd diff3 from OpenBSD. Differences with OpenBSD: - lots of warning fixed - no shell wrapper with diff3 actually living in libexec - capsicumized Keep it disconnected as it is not yet good enough to replace GNU diff The motivation to import it now it to allow other people to jump in and also to have an open development on it Obtained from: OpenBSD 2017-05-25 13:45:50 -04:00			`# $FreeBSD$`

			`PACKAGE= tests`

			`ATF_TESTS_SH= diff3_test`
			`${PACKAGE}FILES+= \`
			`1.txt \`
diff3: implement --strip-trailing-cr Reviewed by: bapt Differential Revision: https://reviews.freebsd.org/D31626 2021-08-20 20:28:58 -04:00			`1cr.txt \`
Import working progress BSD diff3 import bsd diff3 from OpenBSD. Differences with OpenBSD: - lots of warning fixed - no shell wrapper with diff3 actually living in libexec - capsicumized Keep it disconnected as it is not yet good enough to replace GNU diff The motivation to import it now it to allow other people to jump in and also to have an open development on it Obtained from: OpenBSD 2017-05-25 13:45:50 -04:00			`2.txt \`
			`3.txt \`
diff3: allow diff3 ed scripts to generate deletions diff3 with the -e (ed script flag) can generate line deletions, add support for deletions and add a test case to exercise this behaviour. This functionality was unearthed through comparison of bsd diff3 and gnu diff3 output. Reviewed by: pstef Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D34912 2022-04-15 09:59:14 -04:00			`long-m.txt \`
			`long-o.txt \`
			`long-y.txt \`
Import working progress BSD diff3 import bsd diff3 from OpenBSD. Differences with OpenBSD: - lots of warning fixed - no shell wrapper with diff3 actually living in libexec - capsicumized Keep it disconnected as it is not yet good enough to replace GNU diff The motivation to import it now it to allow other people to jump in and also to have an open development on it Obtained from: OpenBSD 2017-05-25 13:45:50 -04:00			`1.out \`
diff3: document and test -T Reviewed by: bapt Differential Revision: https://reviews.freebsd.org/D31650 2021-08-23 15:33:27 -04:00			`1t.out \`
Import working progress BSD diff3 import bsd diff3 from OpenBSD. Differences with OpenBSD: - lots of warning fixed - no shell wrapper with diff3 actually living in libexec - capsicumized Keep it disconnected as it is not yet good enough to replace GNU diff The motivation to import it now it to allow other people to jump in and also to have an open development on it Obtained from: OpenBSD 2017-05-25 13:45:50 -04:00			`2.out \`
			`3.out \`
			`4.out \`
			`5.out \`
			`6.out \`
			`7.out \`
			`8.out \`
diff3: allow diff3 ed scripts to generate deletions diff3 with the -e (ed script flag) can generate line deletions, add support for deletions and add a test case to exercise this behaviour. This functionality was unearthed through comparison of bsd diff3 and gnu diff3 output. Reviewed by: pstef Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D34912 2022-04-15 09:59:14 -04:00			`9.out \`
diff3: Add support for -A Diff3 in -A mode generates an ed script to show how the 3 files and brackets changes that conflict. The ed script generated should when applied leave familiar merge conflict markers in a patched file. Diff3 output is not documented, this feature has been arrived at by comparing bsd diff3 output to gnu diff3 output until they were made to agree. There are likely to still be differences between these formats. The gnu diff3 guide is actually quite good at explaining how diff3 output should appear, but it doesn't cover every form of output from diff3. https://www.gnu.org/software/diffutils/manual/diffutils.html#Comparing-Three-Files Discussed with: pstef, kevans Sponsored by: Klara, Inc. 2022-04-19 10:43:35 -04:00			`long-ed.out \`
diff3: Add support for -m diff3 in -m mode generates a complete file with changes bracketed with conflict markers. This adds support for diff3 to generate version control style three way merge output. The output format was inferred from looking at the gnu diff3 output on a selection of test files as a specification of what diff3 -m should output is not available. It is likely there are cases where the -m output differs from other tools and I am happy to update diff3 to address these. Discussed with: pstef, kevans Sponsored by: Klara, Inc. 2022-04-19 11:20:24 -04:00			`long-A.out \`
			`long-merge.out \`
Import working progress BSD diff3 import bsd diff3 from OpenBSD. Differences with OpenBSD: - lots of warning fixed - no shell wrapper with diff3 actually living in libexec - capsicumized Keep it disconnected as it is not yet good enough to replace GNU diff The motivation to import it now it to allow other people to jump in and also to have an open development on it Obtained from: OpenBSD 2017-05-25 13:45:50 -04:00
			`.include <bsd.test.mk>`