Module Name: src
Committed By: martin
Date: Wed Jun 6 21:23:10 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/infocmp: Makefile t_terminfo.sh
Log Message:
Add a basic test for infocmp - this would have cought todays terminfo
lossage (PR lib/46553).
To generate a diff of this commit:
cvs rdiff -u -r1.472 -r1.473 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.77 -r1.78 src/etc/mtree/NetBSD.dist.tests
cvs rdiff -u -r1.14 -r1.15 src/tests/usr.bin/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/usr.bin/infocmp/Makefile \
src/tests/usr.bin/infocmp/t_terminfo.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.472 src/distrib/sets/lists/tests/mi:1.473
--- src/distrib/sets/lists/tests/mi:1.472 Sun Jun 3 23:19:10 2012
+++ src/distrib/sets/lists/tests/mi Wed Jun 6 21:23:10 2012
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.472 2012/06/03 23:19:10 joerg Exp $
+# $NetBSD: mi,v 1.473 2012/06/06 21:23:10 martin Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -3081,6 +3081,9 @@
./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/infocmp tests-usr.bin-tests
+./usr/tests/usr.bin/infocmp/Atffile tests-usr.bin-tests atf
+./usr/tests/usr.bin/infocmp/t_terminfo 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
Index: src/etc/mtree/NetBSD.dist.tests
diff -u src/etc/mtree/NetBSD.dist.tests:1.77 src/etc/mtree/NetBSD.dist.tests:1.78
--- src/etc/mtree/NetBSD.dist.tests:1.77 Sun May 27 23:03:24 2012
+++ src/etc/mtree/NetBSD.dist.tests Wed Jun 6 21:23:10 2012
@@ -1,4 +1,4 @@
-# $NetBSD: NetBSD.dist.tests,v 1.77 2012/05/27 23:03:24 martin Exp $
+# $NetBSD: NetBSD.dist.tests,v 1.78 2012/06/06 21:23:10 martin Exp $
./usr/libdata/debug/usr/tests
./usr/libdata/debug/usr/tests/atf
@@ -285,6 +285,7 @@
./usr/tests/usr.bin/grep
./usr/tests/usr.bin/gzip
./usr/tests/usr.bin/id
+./usr/tests/usr.bin/infocmp
./usr/tests/usr.bin/jot
./usr/tests/usr.bin/m4
./usr/tests/usr.bin/make
Index: src/tests/usr.bin/Makefile
diff -u src/tests/usr.bin/Makefile:1.14 src/tests/usr.bin/Makefile:1.15
--- src/tests/usr.bin/Makefile:1.14 Fri May 18 15:25:25 2012
+++ src/tests/usr.bin/Makefile Wed Jun 6 21:23:10 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2012/05/18 15:25:25 jruoho Exp $
+# $NetBSD: Makefile,v 1.15 2012/06/06 21:23:10 martin 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 jot m4 make mkdep \
+ diff dirname find grep gzip id infocmp jot m4 make mkdep \
pr rump_server shmif_dumpbus sdiff sed sort tmux unifdef xlint
.include <bsd.test.mk>
Added files:
Index: src/tests/usr.bin/infocmp/Makefile
diff -u /dev/null src/tests/usr.bin/infocmp/Makefile:1.1
--- /dev/null Wed Jun 6 21:23:10 2012
+++ src/tests/usr.bin/infocmp/Makefile Wed Jun 6 21:23:10 2012
@@ -0,0 +1,9 @@
+# $NetBSD: Makefile,v 1.1 2012/06/06 21:23:10 martin Exp $
+
+.include <bsd.own.mk>
+
+TESTSDIR= ${TESTSBASE}/usr.bin/infocmp
+
+TESTS_SH= t_terminfo
+
+.include <bsd.test.mk>
Index: src/tests/usr.bin/infocmp/t_terminfo.sh
diff -u /dev/null src/tests/usr.bin/infocmp/t_terminfo.sh:1.1
--- /dev/null Wed Jun 6 21:23:10 2012
+++ src/tests/usr.bin/infocmp/t_terminfo.sh Wed Jun 6 21:23:10 2012
@@ -0,0 +1,62 @@
+# $NetBSD: t_terminfo.sh,v 1.1 2012/06/06 21:23:10 martin Exp $
+#
+# Copyright (c) 2011 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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" "infocmp can decode one of some existing term types"
+ atf_set "require.progs" "infocmp env"
+}
+
+basic_body() {
+ for term in ansi vt100 wsvt25 sun-ss5 ibcs2 vt52 386at h19k h19kermit
+ do
+ atf_check -s exit:0 -e empty -o not-empty \
+ env TERM="${term}" infocmp
+ done
+}
+
+atf_test_case missing
+missing_head() {
+ atf_set "descr" "infocmp fails to decode non existent entries"
+ atf_set "require.progs" "infocmp env"
+}
+
+missing_body() {
+ for term in this-is-no-term nonexistent
+ do
+ atf_check -s not-exit:0 -e not-empty -o empty \
+ env TERM="${term}" infocmp
+ done
+}
+
+atf_init_test_cases()
+{
+
+ atf_add_test_case basic
+ atf_add_test_case missing
+}
+
