Index: head/bin/cat/tests/Makefile =================================================================== --- head/bin/cat/tests/Makefile +++ head/bin/cat/tests/Makefile @@ -8,6 +8,10 @@ ${PACKAGE}FILES+= d_align.out ${PACKAGE}FILES+= d_se_output.in ${PACKAGE}FILES+= d_se_output.out +${PACKAGE}FILES+= d_s_output.in +${PACKAGE}FILES+= d_s_output.out +${PACKAGE}FILES+= d_vt_output.in +${PACKAGE}FILES+= d_vt_output.out .include Index: head/contrib/netbsd-tests/bin/cat/d_s_output.in =================================================================== --- head/contrib/netbsd-tests/bin/cat/d_s_output.in +++ head/contrib/netbsd-tests/bin/cat/d_s_output.in @@ -0,0 +1,6 @@ +a b c + + +1 2 3 + +x y z Index: head/contrib/netbsd-tests/bin/cat/d_s_output.out =================================================================== --- head/contrib/netbsd-tests/bin/cat/d_s_output.out +++ head/contrib/netbsd-tests/bin/cat/d_s_output.out @@ -0,0 +1,5 @@ +a b c + +1 2 3 + +x y z Index: head/contrib/netbsd-tests/bin/cat/d_vt_output.in =================================================================== --- head/contrib/netbsd-tests/bin/cat/d_vt_output.in +++ head/contrib/netbsd-tests/bin/cat/d_vt_output.in @@ -0,0 +1,3 @@ + + +รก Index: head/contrib/netbsd-tests/bin/cat/d_vt_output.out =================================================================== --- head/contrib/netbsd-tests/bin/cat/d_vt_output.out +++ head/contrib/netbsd-tests/bin/cat/d_vt_output.out @@ -0,0 +1,3 @@ +^I +^X +M-a Index: head/contrib/netbsd-tests/bin/cat/t_cat.sh =================================================================== --- head/contrib/netbsd-tests/bin/cat/t_cat.sh +++ head/contrib/netbsd-tests/bin/cat/t_cat.sh @@ -63,9 +63,50 @@ -x "cat -se $(atf_get_srcdir)/d_se_output.in" } +# Begin FreeBSD +atf_test_case s_output +s_output_head() { + atf_set "descr" "Test that cat(1) squeezes multiple adjacent " \ + "empty lines producing a single spaced output with option '-s'" +} + +s_output_body() { + atf_check -s ignore -o file:$(atf_get_srcdir)/d_s_output.out \ + cat -s $(atf_get_srcdir)/d_s_output.in +} + +atf_test_case e_output +e_output_head() { + atf_set "descr" "Test that cat(1) prints a $ sign " \ + "on blank lines with option '-e'" +} + +e_output_body() { + atf_check -s ignore -o file:$(atf_get_srcdir)/d_se_output.out \ + cat -e $(atf_get_srcdir)/d_se_output.in +} + +atf_test_case vt_output +vt_output_head() { + atf_set "descr" "Test that cat(1) displays non-printing characters, " \ + "namely control characters, tab character and meta-characters " \ + "using options '-vt'" +} + +vt_output_body() { + atf_check -s ignore -o file:$(atf_get_srcdir)/d_vt_output.out \ + cat -vt $(atf_get_srcdir)/d_vt_output.in +} +# End FreeBSD + atf_init_test_cases() { atf_add_test_case align atf_add_test_case nonexistent atf_add_test_case se_output +# Begin FreeBSD + atf_add_test_case s_output + atf_add_test_case e_output + atf_add_test_case vt_output +# End FreeBSD }