Some of the modifications from the previous summer of code has been integrated Modification for compatibility with GNU diff output has been added Main difference with OpenBSD: Implement multiple GNU diff options: * --ignore-file-name-case * --no-ignore-file-name-case * --normal * --tabsize * --strip-trailing-cr Make diff -p compatible with GNU diff Implement diff -l Make diff -r compatible with GNU diff Capsicumize diffing 2 regular files Add a simple test suite Approved by: AsiaBSDcon devsummit Obtained from: OpenBSD, GSoC Relnotes: yes
54 lines
2.0 KiB
Bash
Executable File
54 lines
2.0 KiB
Bash
Executable File
# $FreeBSD$
|
|
|
|
atf_test_case simple
|
|
atf_test_case unified
|
|
|
|
simple_body()
|
|
{
|
|
atf_check -o file:$(atf_get_srcdir)/simple.out -s eq:1 \
|
|
diff "$(atf_get_srcdir)/input1.in" "$(atf_get_srcdir)/input2.in"
|
|
|
|
atf_check -o file:$(atf_get_srcdir)/simple_e.out -s eq:1 \
|
|
diff -e "$(atf_get_srcdir)/input1.in" "$(atf_get_srcdir)/input2.in"
|
|
|
|
atf_check -o file:$(atf_get_srcdir)/simple_u.out -s eq:1 \
|
|
diff -u -L input1 -L input2 "$(atf_get_srcdir)/input1.in" "$(atf_get_srcdir)/input2.in"
|
|
|
|
atf_check -o file:$(atf_get_srcdir)/simple_n.out -s eq:1 \
|
|
diff -n "$(atf_get_srcdir)/input1.in" "$(atf_get_srcdir)/input2.in"
|
|
|
|
atf_check -o inline:"Files $(atf_get_srcdir)/input1.in and $(atf_get_srcdir)/input2.in differ\n" -s eq:1 \
|
|
diff -q "$(atf_get_srcdir)/input1.in" "$(atf_get_srcdir)/input2.in"
|
|
|
|
atf_check \
|
|
diff -q "$(atf_get_srcdir)/input1.in" "$(atf_get_srcdir)/input1.in"
|
|
|
|
atf_check -o file:$(atf_get_srcdir)/simple_i.out -s eq:1 \
|
|
diff -i "$(atf_get_srcdir)/input_c1.in" "$(atf_get_srcdir)/input_c2.in"
|
|
|
|
atf_check -o file:$(atf_get_srcdir)/simple_w.out -s eq:1 \
|
|
diff -w "$(atf_get_srcdir)/input_c1.in" "$(atf_get_srcdir)/input_c2.in"
|
|
|
|
atf_check -o file:$(atf_get_srcdir)/simple_b.out -s eq:1 \
|
|
diff -b "$(atf_get_srcdir)/input_c1.in" "$(atf_get_srcdir)/input_c2.in"
|
|
|
|
atf_check -o file:$(atf_get_srcdir)/simple_p.out -s eq:1 \
|
|
diff --label input_c1.in --label input_c2.in -p "$(atf_get_srcdir)/input_c1.in" "$(atf_get_srcdir)/input_c2.in"
|
|
}
|
|
|
|
unified_body()
|
|
{
|
|
atf_check -o file:$(atf_get_srcdir)/unified_p.out -s eq:1 \
|
|
diff -up -L input_c1.in -L input_c2.in "$(atf_get_srcdir)/input_c1.in" "$(atf_get_srcdir)/input_c2.in"
|
|
atf_check -o file:$(atf_get_srcdir)/unified_c9999.out -s eq:1 \
|
|
diff -u -c9999 -L input_c1.in -L input_c2.in "$(atf_get_srcdir)/input_c1.in" "$(atf_get_srcdir)/input_c2.in"
|
|
atf_check -o file:$(atf_get_srcdir)/unified_9999.out -s eq:1 \
|
|
diff -u9999 -L input_c1.in -L input_c2.in "$(atf_get_srcdir)/input_c1.in" "$(atf_get_srcdir)/input_c2.in"
|
|
}
|
|
|
|
atf_init_test_cases()
|
|
{
|
|
atf_add_test_case simple
|
|
atf_add_test_case unified
|
|
}
|