Module Name: src
Committed By: jruoho
Date: Sat Apr 14 12:21:46 UTC 2012
Modified Files:
src/distrib/sets/lists/tests: mi
src/etc/mtree: NetBSD.dist.tests
src/tests/usr.sbin: Makefile
Added Files:
src/tests/usr.sbin/tcpdump: Makefile t_tcpdump.sh
Log Message:
Add a test case for PR kern/46328 (tested naively with tcpdump(8)).
To generate a diff of this commit:
cvs rdiff -u -r1.463 -r1.464 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.73 -r1.74 src/etc/mtree/NetBSD.dist.tests
cvs rdiff -u -r1.2 -r1.3 src/tests/usr.sbin/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/usr.sbin/tcpdump/Makefile \
src/tests/usr.sbin/tcpdump/t_tcpdump.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.463 src/distrib/sets/lists/tests/mi:1.464
--- src/distrib/sets/lists/tests/mi:1.463 Tue Apr 10 02:39:34 2012
+++ src/distrib/sets/lists/tests/mi Sat Apr 14 12:21:45 2012
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.463 2012/04/10 02:39:34 jruoho Exp $
+# $NetBSD: mi,v 1.464 2012/04/14 12:21:45 jruoho Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -3240,6 +3240,9 @@
./usr/tests/usr.sbin/mtree/d_merge_C_M.out tests-usr.sbin-tests atf
./usr/tests/usr.sbin/mtree/d_merge_C_M_S.out tests-usr.sbin-tests atf
./usr/tests/usr.sbin/mtree/t_mtree tests-usr.sbin-tests atf
+./usr/tests/usr.sbin/tcpdump tests-usr.sbin-tests
+./usr/tests/usr.sbin/tcpdump/Atffile tests-usr.sbin-tests atf
+./usr/tests/usr.sbin/tcpdump/t_tcpdump tests-usr.sbin-tests atf
./usr/tests/usr.sbin/traceroute tests-usr.sbin-tests
./usr/tests/usr.sbin/traceroute/Atffile tests-usr.sbin-tests atf
./usr/tests/usr.sbin/traceroute/t_traceroute tests-usr.sbin-tests atf
Index: src/etc/mtree/NetBSD.dist.tests
diff -u src/etc/mtree/NetBSD.dist.tests:1.73 src/etc/mtree/NetBSD.dist.tests:1.74
--- src/etc/mtree/NetBSD.dist.tests:1.73 Sat Apr 14 02:48:44 2012
+++ src/etc/mtree/NetBSD.dist.tests Sat Apr 14 12:21:46 2012
@@ -1,4 +1,4 @@
-# $NetBSD: NetBSD.dist.tests,v 1.73 2012/04/14 02:48:44 pgoyette Exp $
+# $NetBSD: NetBSD.dist.tests,v 1.74 2012/04/14 12:21:46 jruoho Exp $
./usr/libdata/debug/usr/tests
./usr/libdata/debug/usr/tests/atf
@@ -298,4 +298,5 @@
./usr/tests/usr.bin/xlint/lint1
./usr/tests/usr.sbin
./usr/tests/usr.sbin/mtree
+./usr/tests/usr.sbin/tcpdump
./usr/tests/usr.sbin/traceroute
Index: src/tests/usr.sbin/Makefile
diff -u src/tests/usr.sbin/Makefile:1.2 src/tests/usr.sbin/Makefile:1.3
--- src/tests/usr.sbin/Makefile:1.2 Sat Mar 17 16:33:16 2012
+++ src/tests/usr.sbin/Makefile Sat Apr 14 12:21:45 2012
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2012/03/17 16:33:16 jruoho Exp $
+# $NetBSD: Makefile,v 1.3 2012/04/14 12:21:45 jruoho Exp $
.include <bsd.own.mk>
TESTSDIR= ${TESTSBASE}/usr.sbin
-TESTS_SUBDIRS+= mtree traceroute
+TESTS_SUBDIRS+= mtree tcpdump traceroute
.include <bsd.test.mk>
Added files:
Index: src/tests/usr.sbin/tcpdump/Makefile
diff -u /dev/null src/tests/usr.sbin/tcpdump/Makefile:1.1
--- /dev/null Sat Apr 14 12:21:46 2012
+++ src/tests/usr.sbin/tcpdump/Makefile Sat Apr 14 12:21:45 2012
@@ -0,0 +1,9 @@
+# $NetBS$
+
+.include <bsd.own.mk>
+
+TESTSDIR= ${TESTSBASE}/usr.sbin/tcpdump
+
+TESTS_SH= t_tcpdump
+
+.include <bsd.test.mk>
Index: src/tests/usr.sbin/tcpdump/t_tcpdump.sh
diff -u /dev/null src/tests/usr.sbin/tcpdump/t_tcpdump.sh:1.1
--- /dev/null Sat Apr 14 12:21:46 2012
+++ src/tests/usr.sbin/tcpdump/t_tcpdump.sh Sat Apr 14 12:21:45 2012
@@ -0,0 +1,59 @@
+# $NetBSD: t_tcpdump.sh,v 1.1 2012/04/14 12:21:45 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.
+#
+prom() {
+ atf_check -s ignore -o ignore -e ignore -x "tcpdump -c 1 -i $1" &
+ sleep 2; kill $! >/dev/null 2>&1
+}
+
+atf_test_case promiscuous
+promiscuous_head() {
+ atf_set "require.user" "root"
+ atf_set "descr" "Test that switching an interface into and out " \
+ "of promiscuous mode does not lockup (PR kern/46328)"
+}
+
+promiscuous_body() {
+
+ ifs="lo0 age0 ath0 bge0 re0 sk0 iwn0 wm0 wpi0"
+
+ for i in $ifs; do
+
+ ifconfig $i >/dev/null 2>&1
+
+ if [ $? -eq 0 ]; then
+ echo "Testing $i"
+ prom $i
+ fi
+ done
+}
+
+atf_init_test_cases() {
+ atf_add_test_case promiscuous
+}
