svn commit: r320710 - in stable/10: bin/cat/tests contrib/netbsd-tests/bin/cat
Ngie Cooper
ngie at FreeBSD.org
Thu Jul 6 05:26:29 UTC 2017
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 <netbsd-tests.test.mk>
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
More information about the svn-src-all
mailing list