Index: head/bin/cat/tests/Makefile =================================================================== --- head/bin/cat/tests/Makefile (revision 319636) +++ head/bin/cat/tests/Makefile (revision 319637) @@ -1,24 +1,26 @@ # $FreeBSD$ PACKAGE= tests NETBSD_ATF_TESTS_SH= cat_test ${PACKAGE}FILES+= d_align.in ${PACKAGE}FILES+= d_align.out +${PACKAGE}FILES+= d_b_output.in +${PACKAGE}FILES+= d_b_output.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 d_align.out: ${TESTSRC}/d_align.out sed -E -e 's,^[[:space:]]{7}\$$$$,\$$,' < ${.ALLSRC} > ${.TARGET}.tmp mv ${.TARGET}.tmp ${.TARGET} CLEANFILES+= d_align.out d_align.out.tmp .include Index: head/contrib/netbsd-tests/bin/cat/d_b_output.in =================================================================== --- head/contrib/netbsd-tests/bin/cat/d_b_output.in (nonexistent) +++ head/contrib/netbsd-tests/bin/cat/d_b_output.in (revision 319637) @@ -0,0 +1,4 @@ +This is a line + +The line before this was a blank line. + This line has leading whitespace. Property changes on: head/contrib/netbsd-tests/bin/cat/d_b_output.in ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/contrib/netbsd-tests/bin/cat/d_b_output.out =================================================================== --- head/contrib/netbsd-tests/bin/cat/d_b_output.out (nonexistent) +++ head/contrib/netbsd-tests/bin/cat/d_b_output.out (revision 319637) @@ -0,0 +1,4 @@ + 1 This is a line + + 2 The line before this was a blank line. + 3 This line has leading whitespace. Index: head/contrib/netbsd-tests/bin/cat/t_cat.sh =================================================================== --- head/contrib/netbsd-tests/bin/cat/t_cat.sh (revision 319636) +++ head/contrib/netbsd-tests/bin/cat/t_cat.sh (revision 319637) @@ -1,112 +1,128 @@ # $NetBSD: t_cat.sh,v 1.3 2016/06/16 01:04:58 sevan Exp $ # # Copyright (c) 2012 The NetBSD Foundation, Inc. # All rights reserved. # # This code is derived from software contributed to The NetBSD Foundation # by Jukka Ruohonen. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions # are met: # 1. Redistributions of source code must retain the above copyright # notice, this list of conditions and the following disclaimer. # 2. Redistributions in binary form must reproduce the above copyright # notice, this list of conditions and the following disclaimer in the # documentation and/or other materials provided with the distribution. # # THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS # ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED # TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR # PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS # BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR # CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF # SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS # INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN # CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE # POSSIBILITY OF SUCH DAMAGE. # atf_test_case align align_head() { atf_set "descr" "Test that cat(1) aligns the output " \ "right with options '-be' (PR bin/4841)" } align_body() { atf_check -s ignore -o file:$(atf_get_srcdir)/d_align.out \ -x "cat -be $(atf_get_srcdir)/d_align.in" } atf_test_case nonexistent nonexistent_head() { atf_set "descr" "Test that cat(1) doesn't return zero exit " \ "status for a nonexistent file (PR bin/3538)" } nonexistent_body() { atf_check -s not-exit:0 -o empty -e not-empty \ -x "cat /some/name/that/does/not/exist" } +# Begin FreeBSD +atf_test_case b_output +b_output_head() { + atf_set "descr" "Test that cat(1) prints out numbers on non-blank "\ + "lines with '-b'" +} + +b_output_body() { + atf_check -o file:$(atf_get_srcdir)/d_b_output.out \ + cat -b $(atf_get_srcdir)/d_b_output.in +} +# End FreeBSD + atf_test_case se_output se_output_head() { atf_set "descr" "Test that cat(1) prints a $ sign " \ "on blank lines with options '-se' (PR bin/51250)" } se_output_body() { atf_check -s ignore -o file:$(atf_get_srcdir)/d_se_output.out \ -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 +# Begin FreeBSD + atf_add_test_case b_output +# End FreeBSD 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 }