Module Name: src
Committed By: jruoho
Date: Fri May 18 15:25:26 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/tmux: Makefile t_tmux.sh
Log Message:
Add a test case for PR kern/46463. From Richard Hansen.
To generate a diff of this commit:
cvs rdiff -u -r1.467 -r1.468 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.75 -r1.76 src/etc/mtree/NetBSD.dist.tests
cvs rdiff -u -r1.13 -r1.14 src/tests/usr.bin/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/usr.bin/tmux/Makefile \
src/tests/usr.bin/tmux/t_tmux.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.467 src/distrib/sets/lists/tests/mi:1.468
--- src/distrib/sets/lists/tests/mi:1.467 Mon Apr 30 13:47:51 2012
+++ src/distrib/sets/lists/tests/mi Fri May 18 15:25:25 2012
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.467 2012/04/30 13:47:51 njoly Exp $
+# $NetBSD: mi,v 1.468 2012/05/18 15:25:25 jruoho Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -3178,6 +3178,9 @@
./usr/tests/usr.bin/sort/d_any_char_iflag_out.txt tests-usr.bin-tests atf
./usr/tests/usr.bin/sort/d_any_char_in.txt tests-usr.bin-tests atf
./usr/tests/usr.bin/sort/t_sort tests-usr.bin-tests atf
+./usr/tests/usr.bin/tmux tests-usr.bin-tests
+./usr/tests/usr.bin/tmux/Atffile tests-usr.bin-tests atf atf
+./usr/tests/usr.bin/tmux/t_tmux tests-usr.bin-tests atf
./usr/tests/usr.bin/unifdef tests-usr.bin-tests
./usr/tests/usr.bin/unifdef/Atffile tests-usr.bin-tests atf atf
./usr/tests/usr.bin/unifdef/d_basic.in tests-usr.bin-tests atf
Index: src/etc/mtree/NetBSD.dist.tests
diff -u src/etc/mtree/NetBSD.dist.tests:1.75 src/etc/mtree/NetBSD.dist.tests:1.76
--- src/etc/mtree/NetBSD.dist.tests:1.75 Thu Apr 19 18:51:36 2012
+++ src/etc/mtree/NetBSD.dist.tests Fri May 18 15:25:26 2012
@@ -1,4 +1,4 @@
-# $NetBSD: NetBSD.dist.tests,v 1.75 2012/04/19 18:51:36 jruoho Exp $
+# $NetBSD: NetBSD.dist.tests,v 1.76 2012/05/18 15:25:26 jruoho Exp $
./usr/libdata/debug/usr/tests
./usr/libdata/debug/usr/tests/atf
@@ -293,6 +293,7 @@
./usr/tests/usr.bin/sed
./usr/tests/usr.bin/shmif_dumpbus
./usr/tests/usr.bin/sort
+./usr/tests/usr.bin/tmux
./usr/tests/usr.bin/unifdef
./usr/tests/usr.bin/xlint
./usr/tests/usr.bin/xlint/lint1
Index: src/tests/usr.bin/Makefile
diff -u src/tests/usr.bin/Makefile:1.13 src/tests/usr.bin/Makefile:1.14
--- src/tests/usr.bin/Makefile:1.13 Tue Mar 20 06:18:33 2012
+++ src/tests/usr.bin/Makefile Fri May 18 15:25:25 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2012/03/20 06:18:33 jruoho Exp $
+# $NetBSD: Makefile,v 1.14 2012/05/18 15:25:25 jruoho Exp $
#
.include <bsd.own.mk>
@@ -7,6 +7,6 @@ TESTSDIR= ${TESTSBASE}/usr.bin
TESTS_SUBDIRS= awk basename bzip2 cc cmp config cut \
diff dirname find grep gzip id jot m4 make mkdep \
- pr rump_server shmif_dumpbus sdiff sed sort unifdef xlint
+ pr rump_server shmif_dumpbus sdiff sed sort tmux unifdef xlint
.include <bsd.test.mk>
Added files:
Index: src/tests/usr.bin/tmux/Makefile
diff -u /dev/null src/tests/usr.bin/tmux/Makefile:1.1
--- /dev/null Fri May 18 15:25:26 2012
+++ src/tests/usr.bin/tmux/Makefile Fri May 18 15:25:25 2012
@@ -0,0 +1,8 @@
+# $NetBSD: Makefile,v 1.1 2012/05/18 15:25:25 jruoho Exp $
+
+.include <bsd.own.mk>
+
+TESTSDIR= ${TESTSBASE}/usr.bin/tmux
+TESTS_SH= t_tmux
+
+.include <bsd.test.mk>
Index: src/tests/usr.bin/tmux/t_tmux.sh
diff -u /dev/null src/tests/usr.bin/tmux/t_tmux.sh:1.1
--- /dev/null Fri May 18 15:25:26 2012
+++ src/tests/usr.bin/tmux/t_tmux.sh Fri May 18 15:25:25 2012
@@ -0,0 +1,49 @@
+# $NetBSD: t_tmux.sh,v 1.1 2012/05/18 15:25:25 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.
+#
+
+stdincrash() {
+ atf_check -s ignore -o ignore -e ignore -x \
+ "tmux list-sessions 0<&-" & sleep 2; kill $! >/dev/null 2>&1
+}
+
+atf_test_case stdin
+stdin_head() {
+ atf_set "descr" "Test that tmux(1) does not crash the system " \
+ "when stdin(4) is closed (PR kern/46463)"
+}
+
+stdin_body() {
+ stdincrash
+}
+
+atf_init_test_cases()
+{
+ atf_add_test_case stdin
+}
