Module Name: src
Committed By: jruoho
Date: Tue May 3 08:36:15 UTC 2011
Modified Files:
src/distrib/sets/lists/tests: mi
src/etc/mtree: NetBSD.dist.tests
src/tests/usr.bin: Makefile
Added Files:
src/tests/usr.bin/pr: Makefile d_basic.in d_basic.out t_basic.sh
Log Message:
Add a test for PR bin/41880.
To generate a diff of this commit:
cvs rdiff -u -r1.324 -r1.325 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.44 -r1.45 src/etc/mtree/NetBSD.dist.tests
cvs rdiff -u -r1.3 -r1.4 src/tests/usr.bin/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/usr.bin/pr/Makefile \
src/tests/usr.bin/pr/d_basic.in src/tests/usr.bin/pr/d_basic.out \
src/tests/usr.bin/pr/t_basic.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.324 src/distrib/sets/lists/tests/mi:1.325
--- src/distrib/sets/lists/tests/mi:1.324 Tue May 3 07:56:42 2011
+++ src/distrib/sets/lists/tests/mi Tue May 3 08:36:15 2011
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.324 2011/05/03 07:56:42 jruoho Exp $
+# $NetBSD: mi,v 1.325 2011/05/03 08:36:15 jruoho Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -2304,16 +2304,21 @@
./usr/tests/syscall/t_setuid tests-syscall-tests atf
./usr/tests/syscall/t_timer tests-syscall-tests atf
./usr/tests/syscall/t_umask tests-syscall-tests atf
-./usr/tests/toolchain tests-syscall-tests atf
-./usr/tests/toolchain/Atffile tests-syscall-tests atf
-./usr/tests/toolchain/cc tests-syscall-tests atf
-./usr/tests/toolchain/cc/Atffile tests-syscall-tests atf
-./usr/tests/toolchain/cc/t_hello tests-syscall-tests atf
+./usr/tests/toolchain tests-syscall-tests atf
+./usr/tests/toolchain/Atffile tests-syscall-tests atf
+./usr/tests/toolchain/cc tests-syscall-tests atf
+./usr/tests/toolchain/cc/Atffile tests-syscall-tests atf
+./usr/tests/toolchain/cc/t_hello tests-syscall-tests atf
./usr/tests/usr.bin tests-util-tests
./usr/tests/usr.bin/Atffile tests-sbin-tests atf
+./usr/tests/usr.bin/pr tests-util-tests
+./usr/tests/usr.bin/pr/Atffile tests-util-tests atf
+./usr/tests/usr.bin/pr/d_basic.in tests-util-tests atf
+./usr/tests/usr.bin/pr/d_basic.out tests-util-tests atf
+./usr/tests/usr.bin/pr/t_basic tests-util-tests atf
./usr/tests/usr.bin/rump_server tests-util-tests
./usr/tests/usr.bin/rump_server/Atffile tests-util-tests atf
-./usr/tests/usr.bin/rump_server/t_disk tests-util-tests atf
+./usr/tests/usr.bin/rump_server/t_disk tests-util-tests atf
./usr/tests/usr.bin tests-util-tests
./usr/tests/usr.bin/shmif_dumpbus tests-util-tests
./usr/tests/usr.bin/shmif_dumpbus/Atffile tests-util-tests atf
Index: src/etc/mtree/NetBSD.dist.tests
diff -u src/etc/mtree/NetBSD.dist.tests:1.44 src/etc/mtree/NetBSD.dist.tests:1.45
--- src/etc/mtree/NetBSD.dist.tests:1.44 Tue May 3 07:56:42 2011
+++ src/etc/mtree/NetBSD.dist.tests Tue May 3 08:36:15 2011
@@ -1,4 +1,4 @@
-# $NetBSD: NetBSD.dist.tests,v 1.44 2011/05/03 07:56:42 jruoho Exp $
+# $NetBSD: NetBSD.dist.tests,v 1.45 2011/05/03 08:36:15 jruoho Exp $
./usr/libdata/debug/usr/tests
./usr/libdata/debug/usr/tests/atf
@@ -238,6 +238,7 @@
./usr/tests/toolchain
./usr/tests/toolchain/cc
./usr/tests/usr.bin
+./usr/tests/usr.bin/pr
./usr/tests/usr.bin/rump_server
./usr/tests/usr.bin/shmif_dumpbus
./usr/tests/usr.bin/unifdef
Index: src/tests/usr.bin/Makefile
diff -u src/tests/usr.bin/Makefile:1.3 src/tests/usr.bin/Makefile:1.4
--- src/tests/usr.bin/Makefile:1.3 Tue May 3 07:23:19 2011
+++ src/tests/usr.bin/Makefile Tue May 3 08:36:15 2011
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2011/05/03 07:23:19 jruoho Exp $
+# $NetBSD: Makefile,v 1.4 2011/05/03 08:36:15 jruoho Exp $
#
.include <bsd.own.mk>
TESTSDIR= ${TESTSBASE}/usr.bin
-TESTS_SUBDIRS+= rump_server shmif_dumpbus unifdef
+TESTS_SUBDIRS+= pr rump_server shmif_dumpbus unifdef
.include <bsd.test.mk>
Added files:
Index: src/tests/usr.bin/pr/Makefile
diff -u /dev/null src/tests/usr.bin/pr/Makefile:1.1
--- /dev/null Tue May 3 08:36:16 2011
+++ src/tests/usr.bin/pr/Makefile Tue May 3 08:36:15 2011
@@ -0,0 +1,9 @@
+# $NetBSD: Makefile,v 1.1 2011/05/03 08:36:15 jruoho Exp $
+
+.include <bsd.own.mk>
+
+TESTSDIR= ${TESTSBASE}/usr.bin/pr
+
+TESTS_SH= t_basic
+
+.include <bsd.test.mk>
Index: src/tests/usr.bin/pr/d_basic.in
diff -u /dev/null src/tests/usr.bin/pr/d_basic.in:1.1
--- /dev/null Tue May 3 08:36:16 2011
+++ src/tests/usr.bin/pr/d_basic.in Tue May 3 08:36:15 2011
@@ -0,0 +1,2 @@
+123 456 789
+abc def ghi
Index: src/tests/usr.bin/pr/d_basic.out
diff -u /dev/null src/tests/usr.bin/pr/d_basic.out:1.1
--- /dev/null Tue May 3 08:36:16 2011
+++ src/tests/usr.bin/pr/d_basic.out Tue May 3 08:36:15 2011
@@ -0,0 +1 @@
+123 456 789 abc def ghi
Index: src/tests/usr.bin/pr/t_basic.sh
diff -u /dev/null src/tests/usr.bin/pr/t_basic.sh:1.1
--- /dev/null Tue May 3 08:36:16 2011
+++ src/tests/usr.bin/pr/t_basic.sh Tue May 3 08:36:15 2011
@@ -0,0 +1,50 @@
+#! /usr/bin/atf-sh
+#
+# $NetBSD: t_basic.sh,v 1.1 2011/05/03 08:36:15 jruoho Exp $
+#
+# Copyright (c) 2011 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 basic
+nonexistent_head() {
+ atf_set "descr" "A basic test of pr(1)"
+}
+
+basic_body() {
+
+ atf_expect_fail "PR bin/41880"
+
+ # The output file was generated with "pr (GNU coreutils) 6.10".
+ #
+ atf_check -s ignore -o file:$(atf_get_srcdir)/d_basic.out \
+ -x "pr -t -2 $(atf_get_srcdir)/d_basic.in"
+}
+
+atf_init_test_cases() {
+ atf_add_test_case basic
+}
