mirror of
https://github.com/opnsense/src.git
synced 2026-07-15 20:13:02 -04:00
a6f17dd243
Make the merge mode compatible with GNU diff3 Add tests for all the changes, those tests are extracted from the etcupdate testsuite. This version passes the etcupdate testsuite and the diffutils diff3 test suite. MFC After: 1 week (cherry picked from commit 2cfca8e710f260b8a1bb1ee5e1836a52e468ef4b)
42 lines
577 B
Makefile
42 lines
577 B
Makefile
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 \
|
|
fbsdid1.txt \
|
|
fbsdid2.txt \
|
|
conflict1.txt \
|
|
conflict2.txt \
|
|
conflict3.txt \
|
|
conflict-merge.out \
|
|
simple1.txt \
|
|
simple2.txt \
|
|
simple3.txt \
|
|
simple-merge.out \
|
|
simple-Em.out \
|
|
conflict-Em.out \
|
|
passwd-test.txt \
|
|
passwd-old.txt \
|
|
passwd-new.txt \
|
|
passwd-Em.out
|
|
|
|
.include <bsd.test.mk>
|