From owner-svn-src-stable-10@freebsd.org Thu Jul 6 05:26:29 2017 Return-Path: Delivered-To: svn-src-stable-10@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 815BFDA075C; Thu, 6 Jul 2017 05:26:29 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5B12B8133A; Thu, 6 Jul 2017 05:26:29 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v665QSHs014339; Thu, 6 Jul 2017 05:26:28 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v665QSAi014336; Thu, 6 Jul 2017 05:26:28 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201707060526.v665QSAi014336@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper Date: Thu, 6 Jul 2017 05:26:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r320710 - in stable/10: bin/cat/tests contrib/netbsd-tests/bin/cat X-SVN-Group: stable-10 X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: in stable/10: bin/cat/tests contrib/netbsd-tests/bin/cat X-SVN-Commit-Revision: 320710 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Jul 2017 05:26:29 -0000 Author: ngie Date: Thu Jul 6 05:26:27 2017 New Revision: 320710 URL: https://svnweb.freebsd.org/changeset/base/320710 Log: MFC r319637: Add testcases for `cat -b` Added: stable/10/contrib/netbsd-tests/bin/cat/d_b_output.in - copied unchanged from r319637, head/contrib/netbsd-tests/bin/cat/d_b_output.in stable/10/contrib/netbsd-tests/bin/cat/d_b_output.out - copied unchanged from r319637, head/contrib/netbsd-tests/bin/cat/d_b_output.out Modified: stable/10/bin/cat/tests/Makefile stable/10/contrib/netbsd-tests/bin/cat/t_cat.sh Directory Properties: stable/10/ (props changed) Modified: stable/10/bin/cat/tests/Makefile ============================================================================== --- stable/10/bin/cat/tests/Makefile Thu Jul 6 05:26:24 2017 (r320709) +++ stable/10/bin/cat/tests/Makefile Thu Jul 6 05:26:27 2017 (r320710) @@ -3,15 +3,17 @@ NETBSD_ATF_TESTS_SH= cat_test FILESDIR= ${TESTSDIR} -${PACKAGE}FILES+= d_s_output.in -${PACKAGE}FILES+= d_s_output.out -${PACKAGE}FILES+= d_vt_output.in -${PACKAGE}FILES+= d_vt_output.out FILES+= d_align.in FILES+= d_align.out +FILES+= d_b_output.in +FILES+= d_b_output.out FILES+= d_se_output.in FILES+= d_se_output.out +FILES+= d_s_output.in +FILES+= d_s_output.out +FILES+= d_vt_output.in +FILES+= d_vt_output.out .include Copied: stable/10/contrib/netbsd-tests/bin/cat/d_b_output.in (from r319637, head/contrib/netbsd-tests/bin/cat/d_b_output.in) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/10/contrib/netbsd-tests/bin/cat/d_b_output.in Thu Jul 6 05:26:27 2017 (r320710, copy of r319637, head/contrib/netbsd-tests/bin/cat/d_b_output.in) @@ -0,0 +1,4 @@ +This is a line + +The line before this was a blank line. + This line has leading whitespace. Copied: stable/10/contrib/netbsd-tests/bin/cat/d_b_output.out (from r319637, head/contrib/netbsd-tests/bin/cat/d_b_output.out) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/10/contrib/netbsd-tests/bin/cat/d_b_output.out Thu Jul 6 05:26:27 2017 (r320710, copy of r319637, head/contrib/netbsd-tests/bin/cat/d_b_output.out) @@ -0,0 +1,4 @@ + 1 This is a line + + 2 The line before this was a blank line. + 3 This line has leading whitespace. Modified: stable/10/contrib/netbsd-tests/bin/cat/t_cat.sh ============================================================================== --- stable/10/contrib/netbsd-tests/bin/cat/t_cat.sh Thu Jul 6 05:26:24 2017 (r320709) +++ stable/10/contrib/netbsd-tests/bin/cat/t_cat.sh Thu Jul 6 05:26:27 2017 (r320710) @@ -52,6 +52,19 @@ nonexistent_body() { -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 " \ @@ -103,6 +116,9 @@ 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