Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 6 Jul 2017 05:26:24 +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: r320709 - in stable/11: bin/cat/tests contrib/netbsd-tests/bin/cat
Message-ID:  <201707060526.v665QOt0014284@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: ngie
Date: Thu Jul  6 05:26:24 2017
New Revision: 320709
URL: https://svnweb.freebsd.org/changeset/base/320709

Log:
  MFC r319637:
  
  Add testcases for `cat -b`

Added:
  stable/11/contrib/netbsd-tests/bin/cat/d_b_output.in
     - copied unchanged from r319637, head/contrib/netbsd-tests/bin/cat/d_b_output.in
  stable/11/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/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:22:10 2017	(r320708)
+++ stable/11/bin/cat/tests/Makefile	Thu Jul  6 05:26:24 2017	(r320709)
@@ -6,6 +6,8 @@ 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

Copied: stable/11/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/11/contrib/netbsd-tests/bin/cat/d_b_output.in	Thu Jul  6 05:26:24 2017	(r320709, 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/11/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/11/contrib/netbsd-tests/bin/cat/d_b_output.out	Thu Jul  6 05:26:24 2017	(r320709, 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/11/contrib/netbsd-tests/bin/cat/t_cat.sh
==============================================================================
--- stable/11/contrib/netbsd-tests/bin/cat/t_cat.sh	Thu Jul  6 05:22:10 2017	(r320708)
+++ stable/11/contrib/netbsd-tests/bin/cat/t_cat.sh	Thu Jul  6 05:26:24 2017	(r320709)
@@ -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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201707060526.v665QOt0014284>