aboutsummaryrefslogtreecommitdiff
path: root/usr.bin/diff/tests/diff_test.sh
diff options
context:
space:
mode:
authorBaptiste Daroussin <bapt@FreeBSD.org>2017-04-20 14:22:33 +0000
committerBaptiste Daroussin <bapt@FreeBSD.org>2017-04-20 14:22:33 +0000
commitfddcb7b82ff45dc9e08bab26bbfe7a2d2e8ca20f (patch)
tree3e485615652828e8d65ef213796a7cc011a0ddf6 /usr.bin/diff/tests/diff_test.sh
parent431bcfcdbde1606906a9c0be6930992e315dee5a (diff)
Notes
Diffstat (limited to 'usr.bin/diff/tests/diff_test.sh')
-rwxr-xr-xusr.bin/diff/tests/diff_test.sh11
1 files changed, 11 insertions, 0 deletions
diff --git a/usr.bin/diff/tests/diff_test.sh b/usr.bin/diff/tests/diff_test.sh
index 589bc9a8603b..62ca8277c5f3 100755
--- a/usr.bin/diff/tests/diff_test.sh
+++ b/usr.bin/diff/tests/diff_test.sh
@@ -5,6 +5,7 @@ atf_test_case unified
atf_test_case header
atf_test_case header_ns
atf_test_case ifdef
+atf_test_case group_format
simple_body()
{
@@ -78,6 +79,15 @@ ifdef_body()
"$(atf_get_srcdir)/input_c2.in"
}
+group_format_body()
+{
+ atf_check -o file:$(atf_get_srcdir)/group-format.out -s eq:1 \
+ diff --changed-group-format='<<<<<<< (local)
+%<=======
+%>>>>>>>> (stock)
+' "$(atf_get_srcdir)/input_c1.in" "$(atf_get_srcdir)/input_c2.in"
+}
+
atf_init_test_cases()
{
atf_add_test_case simple
@@ -85,4 +95,5 @@ atf_init_test_cases()
atf_add_test_case header
atf_add_test_case header_ns
atf_add_test_case ifdef
+ atf_add_test_case group_format
}