Module Name: src
Committed By: jruoho
Date: Tue Mar 27 08:16:33 UTC 2012
Modified Files:
src/distrib/sets/lists/tests: mi
src/etc/mtree: NetBSD.dist.tests
src/tests/bin: Makefile
Added Files:
src/tests/bin/cat: Makefile d_align.in d_align.out t_cat.sh
Log Message:
Add regression tests for the 1990s bugs PR bin/3538 and PR bin/4841.
To generate a diff of this commit:
cvs rdiff -u -r1.457 -r1.458 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.69 -r1.70 src/etc/mtree/NetBSD.dist.tests
cvs rdiff -u -r1.1 -r1.2 src/tests/bin/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/bin/cat/Makefile \
src/tests/bin/cat/d_align.in src/tests/bin/cat/d_align.out \
src/tests/bin/cat/t_cat.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/tests/mi
diff -u src/distrib/sets/lists/tests/mi:1.457 src/distrib/sets/lists/tests/mi:1.458
--- src/distrib/sets/lists/tests/mi:1.457 Tue Mar 27 07:39:00 2012
+++ src/distrib/sets/lists/tests/mi Tue Mar 27 08:16:33 2012
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.457 2012/03/27 07:39:00 jruoho Exp $
+# $NetBSD: mi,v 1.458 2012/03/27 08:16:33 jruoho Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -1353,6 +1353,11 @@
./usr/tests/atf/units/t_utils tests-obsolete obsolete
./usr/tests/bin tests-bin-tests
./usr/tests/bin/Atffile tests-bin-tests atf
+./usr/tests/bin/cat tests-bin-tests
+./usr/tests/bin/cat/Atffile tests-bin-tests atf
+./usr/tests/bin/cat/d_align.in tests-bin-tests atf
+./usr/tests/bin/cat/d_align.out tests-bin-tests atf
+./usr/tests/bin/cat/t_cat tests-bin-tests atf
./usr/tests/bin/cp tests-bin-tests
./usr/tests/bin/cp/Atffile tests-bin-tests atf
./usr/tests/bin/cp/t_cp tests-bin-tests atf
Index: src/etc/mtree/NetBSD.dist.tests
diff -u src/etc/mtree/NetBSD.dist.tests:1.69 src/etc/mtree/NetBSD.dist.tests:1.70
--- src/etc/mtree/NetBSD.dist.tests:1.69 Tue Mar 20 06:18:34 2012
+++ src/etc/mtree/NetBSD.dist.tests Tue Mar 27 08:16:33 2012
@@ -1,4 +1,4 @@
-# $NetBSD: NetBSD.dist.tests,v 1.69 2012/03/20 06:18:34 jruoho Exp $
+# $NetBSD: NetBSD.dist.tests,v 1.70 2012/03/27 08:16:33 jruoho Exp $
./usr/libdata/debug/usr/tests
./usr/libdata/debug/usr/tests/atf
@@ -129,6 +129,7 @@
./usr/tests/atf/atf-sh
./usr/tests/atf/test-programs
./usr/tests/bin
+./usr/tests/bin/cat
./usr/tests/bin/cp
./usr/tests/bin/dd
./usr/tests/bin/df
Index: src/tests/bin/Makefile
diff -u src/tests/bin/Makefile:1.1 src/tests/bin/Makefile:1.2
--- src/tests/bin/Makefile:1.1 Sat Mar 17 16:33:10 2012
+++ src/tests/bin/Makefile Tue Mar 27 08:16:33 2012
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2012/03/17 16:33:10 jruoho Exp $
+# $NetBSD: Makefile,v 1.2 2012/03/27 08:16:33 jruoho Exp $
.include <bsd.own.mk>
TESTSDIR= ${TESTSBASE}/bin
-TESTS_SUBDIRS= cp dd df expr pax ps sh tar
+TESTS_SUBDIRS= cat cp dd df expr pax ps sh tar
.include <bsd.test.mk>
Added files:
Index: src/tests/bin/cat/Makefile
diff -u /dev/null src/tests/bin/cat/Makefile:1.1
--- /dev/null Tue Mar 27 08:16:33 2012
+++ src/tests/bin/cat/Makefile Tue Mar 27 08:16:33 2012
@@ -0,0 +1,12 @@
+# $NetBSD: Makefile,v 1.1 2012/03/27 08:16:33 jruoho Exp $
+
+.include <bsd.own.mk>
+
+TESTSDIR= ${TESTSBASE}/bin/cat
+TESTS_SH= t_cat
+
+FILESDIR= ${TESTSDIR}
+FILES+= d_align.in
+FILES+= d_align.out
+
+.include <bsd.test.mk>
Index: src/tests/bin/cat/d_align.in
diff -u /dev/null src/tests/bin/cat/d_align.in:1.1
--- /dev/null Tue Mar 27 08:16:33 2012
+++ src/tests/bin/cat/d_align.in Tue Mar 27 08:16:33 2012
@@ -0,0 +1,3 @@
+a b c
+1 2 3
+x y z
Index: src/tests/bin/cat/d_align.out
diff -u /dev/null src/tests/bin/cat/d_align.out:1.1
--- /dev/null Tue Mar 27 08:16:33 2012
+++ src/tests/bin/cat/d_align.out Tue Mar 27 08:16:33 2012
@@ -0,0 +1,3 @@
+ 1 a b c$
+ 2 1 2 3$
+ 3 x y z$
Index: src/tests/bin/cat/t_cat.sh
diff -u /dev/null src/tests/bin/cat/t_cat.sh:1.1
--- /dev/null Tue Mar 27 08:16:33 2012
+++ src/tests/bin/cat/t_cat.sh Tue Mar 27 08:16:33 2012
@@ -0,0 +1,59 @@
+# $NetBSD: t_cat.sh,v 1.1 2012/03/27 08:16:33 jruoho 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) doest 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"
+}
+
+atf_init_test_cases()
+{
+ atf_add_test_case align
+ atf_add_test_case nonexistent
+}
