Module Name: src
Committed By: jruoho
Date: Tue Mar 20 06:18:34 UTC 2012
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/jot: Makefile d_basic.out t_jot.sh
Log Message:
Add regression tests for PR bin/12424, PR bin/12316, and PR bin/14253,
all fixed long time ago.
To generate a diff of this commit:
cvs rdiff -u -r1.452 -r1.453 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.68 -r1.69 src/etc/mtree/NetBSD.dist.tests
cvs rdiff -u -r1.12 -r1.13 src/tests/usr.bin/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/usr.bin/jot/Makefile \
src/tests/usr.bin/jot/d_basic.out src/tests/usr.bin/jot/t_jot.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.452 src/distrib/sets/lists/tests/mi:1.453
--- src/distrib/sets/lists/tests/mi:1.452 Mon Mar 19 11:16:36 2012
+++ src/distrib/sets/lists/tests/mi Tue Mar 20 06:18:34 2012
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.452 2012/03/19 11:16:36 njoly Exp $
+# $NetBSD: mi,v 1.453 2012/03/20 06:18:34 jruoho Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -2896,6 +2896,10 @@
./usr/tests/usr.bin/id/t_groups tests-usr.bin-tests atf
./usr/tests/usr.bin/id/t_id tests-usr.bin-tests atf
./usr/tests/usr.bin/id/t_whoami tests-usr.bin-tests atf
+./usr/tests/usr.bin/jot tests-usr.bin-tests
+./usr/tests/usr.bin/jot/Atffile tests-usr.bin-tests atf
+./usr/tests/usr.bin/jot/d_basic.out tests-usr.bin-tests atf
+./usr/tests/usr.bin/jot/t_jot tests-usr.bin-tests atf
./usr/tests/usr.bin/m4 tests-usr.bin-tests
./usr/tests/usr.bin/m4/Atffile tests-usr.bin-tests atf
./usr/tests/usr.bin/m4/d_ff_after_dnl.m4.uue tests-usr.bin-tests atf
Index: src/etc/mtree/NetBSD.dist.tests
diff -u src/etc/mtree/NetBSD.dist.tests:1.68 src/etc/mtree/NetBSD.dist.tests:1.69
--- src/etc/mtree/NetBSD.dist.tests:1.68 Mon Mar 19 11:16:37 2012
+++ src/etc/mtree/NetBSD.dist.tests Tue Mar 20 06:18:34 2012
@@ -1,4 +1,4 @@
-# $NetBSD: NetBSD.dist.tests,v 1.68 2012/03/19 11:16:37 njoly Exp $
+# $NetBSD: NetBSD.dist.tests,v 1.69 2012/03/20 06:18:34 jruoho Exp $
./usr/libdata/debug/usr/tests
./usr/libdata/debug/usr/tests/atf
@@ -281,6 +281,7 @@
./usr/tests/usr.bin/grep
./usr/tests/usr.bin/gzip
./usr/tests/usr.bin/id
+./usr/tests/usr.bin/jot
./usr/tests/usr.bin/m4
./usr/tests/usr.bin/make
./usr/tests/usr.bin/mkdep
Index: src/tests/usr.bin/Makefile
diff -u src/tests/usr.bin/Makefile:1.12 src/tests/usr.bin/Makefile:1.13
--- src/tests/usr.bin/Makefile:1.12 Mon Mar 19 07:05:18 2012
+++ src/tests/usr.bin/Makefile Tue Mar 20 06:18:33 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2012/03/19 07:05:18 jruoho Exp $
+# $NetBSD: Makefile,v 1.13 2012/03/20 06:18:33 jruoho Exp $
#
.include <bsd.own.mk>
@@ -6,7 +6,7 @@
TESTSDIR= ${TESTSBASE}/usr.bin
TESTS_SUBDIRS= awk basename bzip2 cc cmp config cut \
- diff dirname find grep gzip id m4 make mkdep \
+ diff dirname find grep gzip id jot m4 make mkdep \
pr rump_server shmif_dumpbus sdiff sed sort unifdef xlint
.include <bsd.test.mk>
Added files:
Index: src/tests/usr.bin/jot/Makefile
diff -u /dev/null src/tests/usr.bin/jot/Makefile:1.1
--- /dev/null Tue Mar 20 06:18:34 2012
+++ src/tests/usr.bin/jot/Makefile Tue Mar 20 06:18:34 2012
@@ -0,0 +1,8 @@
+# $NetBSD: Makefile,v 1.1 2012/03/20 06:18:34 jruoho Exp $
+
+.include <bsd.own.mk>
+
+TESTSDIR= ${TESTSBASE}/usr.bin/jot
+TESTS_SH= t_jot
+
+.include <bsd.test.mk>
Index: src/tests/usr.bin/jot/d_basic.out
diff -u /dev/null src/tests/usr.bin/jot/d_basic.out:1.1
--- /dev/null Tue Mar 20 06:18:34 2012
+++ src/tests/usr.bin/jot/d_basic.out Tue Mar 20 06:18:34 2012
@@ -0,0 +1,21 @@
+-1.00
+-0.90
+-0.80
+-0.70
+-0.60
+-0.50
+-0.40
+-0.30
+-0.20
+-0.10
+-0.00
+0.10
+0.20
+0.30
+0.40
+0.50
+0.60
+0.70
+0.80
+0.90
+1.00
Index: src/tests/usr.bin/jot/t_jot.sh
diff -u /dev/null src/tests/usr.bin/jot/t_jot.sh:1.1
--- /dev/null Tue Mar 20 06:18:34 2012
+++ src/tests/usr.bin/jot/t_jot.sh Tue Mar 20 06:18:34 2012
@@ -0,0 +1,56 @@
+# $NetBSD: t_jot.sh,v 1.1 2012/03/20 06:18:34 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 basic
+basic_head() {
+ atf_set "descr" "Test that jot(1)'s output is sane (PR bin/12424)"
+}
+
+basic_body() {
+ atf_check -o file:"$(atf_get_srcdir)/d_basic.out" jot 21 -1 1.00
+}
+
+atf_test_case format
+format_head() {
+ atf_set "descr" "Test that jot(1) handles format strings " \
+ "correctly (PR bin/12316, PR bin/14253)"
+}
+
+format_body() {
+ atf_check -s exit:0 -o ignore jot -w xa%c 26 a
+ atf_check -s not-exit:0 -e not-empty jot -w %2 12
+ atf_check -s not-exit:0 -e not-empty jot -w %0 10 1 10
+}
+
+atf_init_test_cases()
+{
+ atf_add_test_case basic
+ atf_add_test_case format
+}
