Date: Thu, 6 Jul 2017 05:22:02 +0000 (UTC) From: Ngie Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r320707 - in stable/11: bin/cat/tests contrib/netbsd-tests/bin/cat Message-ID: <201707060522.v665M2A3011710@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ngie Date: Thu Jul 6 05:22:02 2017 New Revision: 320707 URL: https://svnweb.freebsd.org/changeset/base/320707 Log: MFC r319634: Add additional testcases for cat(1) Verify the following additional cases: - -s (in isolation, in addition to the -se testcase obtained via the NetBSD test). - -vt Added: stable/11/contrib/netbsd-tests/bin/cat/d_s_output.in - copied unchanged from r319634, head/contrib/netbsd-tests/bin/cat/d_s_output.in stable/11/contrib/netbsd-tests/bin/cat/d_s_output.out - copied unchanged from r319634, head/contrib/netbsd-tests/bin/cat/d_s_output.out stable/11/contrib/netbsd-tests/bin/cat/d_vt_output.in - copied unchanged from r319634, head/contrib/netbsd-tests/bin/cat/d_vt_output.in stable/11/contrib/netbsd-tests/bin/cat/d_vt_output.out - copied unchanged from r319634, head/contrib/netbsd-tests/bin/cat/d_vt_output.out Modified: stable/11/bin/cat/tests/Makefile stable/11/contrib/netbsd-tests/bin/cat/t_cat.sh Directory Properties: stable/11/ (props changed) Modified: stable/11/bin/cat/tests/Makefile ============================================================================== --- stable/11/bin/cat/tests/Makefile Thu Jul 6 05:20:30 2017 (r320706) +++ stable/11/bin/cat/tests/Makefile Thu Jul 6 05:22:02 2017 (r320707) @@ -8,6 +8,10 @@ ${PACKAGE}FILES+= d_align.in ${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 <netbsd-tests.test.mk> Copied: stable/11/contrib/netbsd-tests/bin/cat/d_s_output.in (from r319634, head/contrib/netbsd-tests/bin/cat/d_s_output.in) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/11/contrib/netbsd-tests/bin/cat/d_s_output.in Thu Jul 6 05:22:02 2017 (r320707, copy of r319634, head/contrib/netbsd-tests/bin/cat/d_s_output.in) @@ -0,0 +1,6 @@ +a b c + + +1 2 3 + +x y z Copied: stable/11/contrib/netbsd-tests/bin/cat/d_s_output.out (from r319634, head/contrib/netbsd-tests/bin/cat/d_s_output.out) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/11/contrib/netbsd-tests/bin/cat/d_s_output.out Thu Jul 6 05:22:02 2017 (r320707, copy of r319634, head/contrib/netbsd-tests/bin/cat/d_s_output.out) @@ -0,0 +1,5 @@ +a b c + +1 2 3 + +x y z Copied: stable/11/contrib/netbsd-tests/bin/cat/d_vt_output.in (from r319634, head/contrib/netbsd-tests/bin/cat/d_vt_output.in) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/11/contrib/netbsd-tests/bin/cat/d_vt_output.in Thu Jul 6 05:22:02 2017 (r320707, copy of r319634, head/contrib/netbsd-tests/bin/cat/d_vt_output.in) @@ -0,0 +1,3 @@ + +<BS> +á Copied: stable/11/contrib/netbsd-tests/bin/cat/d_vt_output.out (from r319634, head/contrib/netbsd-tests/bin/cat/d_vt_output.out) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/11/contrib/netbsd-tests/bin/cat/d_vt_output.out Thu Jul 6 05:22:02 2017 (r320707, copy of r319634, head/contrib/netbsd-tests/bin/cat/d_vt_output.out) @@ -0,0 +1,3 @@ +^I +^X<BS> +M-a Modified: stable/11/contrib/netbsd-tests/bin/cat/t_cat.sh ============================================================================== --- stable/11/contrib/netbsd-tests/bin/cat/t_cat.sh Thu Jul 6 05:20:30 2017 (r320706) +++ stable/11/contrib/netbsd-tests/bin/cat/t_cat.sh Thu Jul 6 05:22:02 2017 (r320707) @@ -63,9 +63,50 @@ se_output_body() { -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 }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201707060522.v665M2A3011710>