Add test cases for different 802.11 options. These include cases for PR kern/35045, PR kern/45745, and PR kern/55424.diff -r1.854 -r1.855 src/distrib/sets/lists/tests/mi
(jruoho)
--- src/distrib/sets/lists/tests/mi 2020/06/25 18:30:42 1.854
+++ src/distrib/sets/lists/tests/mi 2020/06/27 05:07:07 1.855
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | # $NetBSD: mi,v 1.854 2020/06/25 18:30:42 jruoho Exp $ | 1 | # $NetBSD: mi,v 1.855 2020/06/27 05:07:07 jruoho Exp $ | |
2 | # | 2 | # | |
3 | # Note: don't delete entries from here - mark them as "obsolete" instead. | 3 | # Note: don't delete entries from here - mark them as "obsolete" instead. | |
4 | # | 4 | # | |
5 | ./etc/mtree/set.tests tests-sys-root | 5 | ./etc/mtree/set.tests tests-sys-root | |
6 | ./usr/libdata/debug/usr/tests tests-base-debug compattestdir | 6 | ./usr/libdata/debug/usr/tests tests-base-debug compattestdir | |
7 | ./usr/libdata/debug/usr/tests/atf tests-atf-debug compattestfile,atf | 7 | ./usr/libdata/debug/usr/tests/atf tests-atf-debug compattestfile,atf | |
8 | ./usr/libdata/debug/usr/tests/atf/atf-c tests-atf-debug compattestfile,atf | 8 | ./usr/libdata/debug/usr/tests/atf/atf-c tests-atf-debug compattestfile,atf | |
9 | ./usr/libdata/debug/usr/tests/atf/atf-c++ tests-atf-debug compattestfile,atf | 9 | ./usr/libdata/debug/usr/tests/atf/atf-c++ tests-atf-debug compattestfile,atf | |
10 | ./usr/libdata/debug/usr/tests/atf/atf-c++/detail tests-atf-debug compattestfile,atf | 10 | ./usr/libdata/debug/usr/tests/atf/atf-c++/detail tests-atf-debug compattestfile,atf | |
11 | ./usr/libdata/debug/usr/tests/atf/atf-c/detail tests-atf-debug compattestfile,atf | 11 | ./usr/libdata/debug/usr/tests/atf/atf-c/detail tests-atf-debug compattestfile,atf | |
12 | ./usr/libdata/debug/usr/tests/atf/atf-compile tests-obsolete obsolete | 12 | ./usr/libdata/debug/usr/tests/atf/atf-compile tests-obsolete obsolete | |
13 | ./usr/libdata/debug/usr/tests/atf/atf-report tests-obsolete obsolete | 13 | ./usr/libdata/debug/usr/tests/atf/atf-report tests-obsolete obsolete | |
14 | ./usr/libdata/debug/usr/tests/atf/atf-run tests-obsolete obsolete | 14 | ./usr/libdata/debug/usr/tests/atf/atf-run tests-obsolete obsolete | |
@@ -3989,26 +3989,27 @@ | @@ -3989,26 +3989,27 @@ | |||
3989 | ./usr/tests/sbin/gpt/gpt.empty.show.normal tests-sbin-tests compattestfile,atf | 3989 | ./usr/tests/sbin/gpt/gpt.empty.show.normal tests-sbin-tests compattestfile,atf | |
3990 | ./usr/tests/sbin/gpt/gpt.removepart.show.normal tests-sbin-tests compattestfile,atf | 3990 | ./usr/tests/sbin/gpt/gpt.removepart.show.normal tests-sbin-tests compattestfile,atf | |
3991 | ./usr/tests/sbin/gpt/gpt.resizedisk.show.normal tests-sbin-tests compattestfile,atf | 3991 | ./usr/tests/sbin/gpt/gpt.resizedisk.show.normal tests-sbin-tests compattestfile,atf | |
3992 | ./usr/tests/sbin/gpt/gpt.resizepart.show.normal tests-sbin-tests compattestfile,atf | 3992 | ./usr/tests/sbin/gpt/gpt.resizepart.show.normal tests-sbin-tests compattestfile,atf | |
3993 | ./usr/tests/sbin/gpt/t_gpt tests-sbin-tests compattestfile,atf | 3993 | ./usr/tests/sbin/gpt/t_gpt tests-sbin-tests compattestfile,atf | |
3994 | ./usr/tests/sbin/ifconfig tests-sbin-tests compattestfile,atf | 3994 | ./usr/tests/sbin/ifconfig tests-sbin-tests compattestfile,atf | |
3995 | ./usr/tests/sbin/ifconfig/Atffile tests-sbin-tests compattestfile,atf | 3995 | ./usr/tests/sbin/ifconfig/Atffile tests-sbin-tests compattestfile,atf | |
3996 | ./usr/tests/sbin/ifconfig/Kyuafile tests-sbin-tests compattestfile,atf,kyua | 3996 | ./usr/tests/sbin/ifconfig/Kyuafile tests-sbin-tests compattestfile,atf,kyua | |
3997 | ./usr/tests/sbin/ifconfig/t_bridge tests-sbin-tests compattestfile,atf | 3997 | ./usr/tests/sbin/ifconfig/t_bridge tests-sbin-tests compattestfile,atf | |
3998 | ./usr/tests/sbin/ifconfig/t_nonexistent tests-sbin-tests compattestfile,atf | 3998 | ./usr/tests/sbin/ifconfig/t_nonexistent tests-sbin-tests compattestfile,atf | |
3999 | ./usr/tests/sbin/ifconfig/t_repeated_scan tests-sbin-tests compattestfile,atf | 3999 | ./usr/tests/sbin/ifconfig/t_repeated_scan tests-sbin-tests compattestfile,atf | |
4000 | ./usr/tests/sbin/ifconfig/t_repeated_updown tests-sbin-tests compattestfile,atf | 4000 | ./usr/tests/sbin/ifconfig/t_repeated_updown tests-sbin-tests compattestfile,atf | |
4001 | ./usr/tests/sbin/ifconfig/t_tap tests-sbin-tests compattestfile,atf | 4001 | ./usr/tests/sbin/ifconfig/t_tap tests-sbin-tests compattestfile,atf | |
4002 | ./usr/tests/sbin/ifconfig/t_woptions tests-sbin-tests compattestfile,atf | |||
4002 | ./usr/tests/sbin/newfs tests-sbin-tests compattestfile,atf | 4003 | ./usr/tests/sbin/newfs tests-sbin-tests compattestfile,atf | |
4003 | ./usr/tests/sbin/newfs/Atffile tests-sbin-tests compattestfile,atf | 4004 | ./usr/tests/sbin/newfs/Atffile tests-sbin-tests compattestfile,atf | |
4004 | ./usr/tests/sbin/newfs/Kyuafile tests-sbin-tests compattestfile,atf,kyua | 4005 | ./usr/tests/sbin/newfs/Kyuafile tests-sbin-tests compattestfile,atf,kyua | |
4005 | ./usr/tests/sbin/newfs/t_enable_quotas tests-sbin-tests compattestfile,atf | 4006 | ./usr/tests/sbin/newfs/t_enable_quotas tests-sbin-tests compattestfile,atf | |
4006 | ./usr/tests/sbin/newfs_msdos tests-sbin-tests compattestfile,atf | 4007 | ./usr/tests/sbin/newfs_msdos tests-sbin-tests compattestfile,atf | |
4007 | ./usr/tests/sbin/newfs_msdos/Atffile tests-sbin-tests compattestfile,atf | 4008 | ./usr/tests/sbin/newfs_msdos/Atffile tests-sbin-tests compattestfile,atf | |
4008 | ./usr/tests/sbin/newfs_msdos/Kyuafile tests-sbin-tests compattestfile,atf,kyua | 4009 | ./usr/tests/sbin/newfs_msdos/Kyuafile tests-sbin-tests compattestfile,atf,kyua | |
4009 | ./usr/tests/sbin/newfs_msdos/t_create tests-sbin-tests compattestfile,atf | 4010 | ./usr/tests/sbin/newfs_msdos/t_create tests-sbin-tests compattestfile,atf | |
4010 | ./usr/tests/sbin/resize_ffs tests-sbin-tests compattestfile,atf | 4011 | ./usr/tests/sbin/resize_ffs tests-sbin-tests compattestfile,atf | |
4011 | ./usr/tests/sbin/resize_ffs/Atffile tests-sbin-tests compattestfile,atf | 4012 | ./usr/tests/sbin/resize_ffs/Atffile tests-sbin-tests compattestfile,atf | |
4012 | ./usr/tests/sbin/resize_ffs/Kyuafile tests-sbin-tests compattestfile,atf,kyua | 4013 | ./usr/tests/sbin/resize_ffs/Kyuafile tests-sbin-tests compattestfile,atf,kyua | |
4013 | ./usr/tests/sbin/resize_ffs/t_check tests-sbin-tests compattestfile,atf | 4014 | ./usr/tests/sbin/resize_ffs/t_check tests-sbin-tests compattestfile,atf | |
4014 | ./usr/tests/sbin/resize_ffs/t_grow tests-sbin-tests compattestfile,atf | 4015 | ./usr/tests/sbin/resize_ffs/t_grow tests-sbin-tests compattestfile,atf |
--- src/tests/sbin/ifconfig/Makefile 2020/06/25 18:30:42 1.5
+++ src/tests/sbin/ifconfig/Makefile 2020/06/27 05:07:07 1.6
@@ -1,9 +1,14 @@ | @@ -1,9 +1,14 @@ | |||
1 | # $NetBSD: Makefile,v 1.5 2020/06/25 18:30:42 jruoho Exp $ | 1 | # $NetBSD: Makefile,v 1.6 2020/06/27 05:07:07 jruoho Exp $ | |
2 | 2 | |||
3 | .include <bsd.own.mk> | 3 | .include <bsd.own.mk> | |
4 | 4 | |||
5 | TESTSDIR= ${TESTSBASE}/sbin/ifconfig | 5 | TESTSDIR= ${TESTSBASE}/sbin/ifconfig | |
6 | 6 | |||
7 | TESTS_SH= t_bridge t_nonexistent t_repeated_scan t_repeated_updown t_tap | 7 | TESTS_SH= t_bridge \ | |
8 | t_nonexistent \ | |||
9 | t_repeated_scan \ | |||
10 | t_repeated_updown \ | |||
11 | t_tap \ | |||
12 | t_woptions | |||
8 | 13 | |||
9 | .include <bsd.test.mk> | 14 | .include <bsd.test.mk> |
# $NetBSD: t_woptions.sh,v 1.1 2020/06/27 05:07:08 jruoho Exp $
#
# Copyright (c) 2020 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 chan
chan_head() {
atf_set "require.user" "root"
atf_set "descr" "Test with ifconfig(8) that setting " \
"802.11 channels does not panic (PR kern/55424)"
}
chan_body() {
# This sequence covers both valid and invalid channels.
# Different 802.11 modes are not taken into account, and
# all interfaces are tested, including non-802.11 ones.
#
chans=$(seq 1 500)
pkill -9 hostapd
pkill -9 wpa_supplicant
for i in $(ifconfig -l); do
if [ ! -z "$(echo $i | grep urtwn)" ]; then
echo "Skipping $i (PR kern/55424)"
continue
fi
state="up"
ifconfig -s $i
if [ $? -eq 1 ]; then
state="down"
fi
m=""
mm=$(ifconfig $i | grep "chan")
if [ ! -z "$mm" ]; then
m=$(echo $mm | awk {'print $2'})
fi
for j in $chans; do
echo "Request: $i -> 802.11 chan $j"
ifconfig $i chan $j >/dev/null 2>&1
echo "Request: $i -> 802.11 -chan $j"
ifconfig $i -chan $j >/dev/null 2>&1
done
if [ ! -z $m ]; then
ifconfig $i chan $m >/dev/null 2>&1
echo "Restored the channel of $i to $m"
fi
ifconfig $i $state
echo "Restored state of $i to $state"
sleep 1
done
/bin/sh /etc/rc.d/hostapd restart >/dev/null 2>&1
/bin/sh /etc/rc.d/wpa_supplicant restart >/dev/null 2>&1
atf_pass
}
atf_test_case mediaopt
mediaopt_head() {
atf_set "require.user" "root"
atf_set "descr" "Test with ifconfig(8) that setting " \
"802.11 media options does not panic (PR kern/35045)"
}
mediaopt_body() {
# Again, also non-802.11 interfaces are tested.
#
opts="adhoc monitor hostap"
pkill -9 hostapd
pkill -9 wpa_supplicant
for i in $(ifconfig -l); do
state="up"
ifconfig -s $i
if [ $? -eq 1 ]; then
state="down"
fi
m=""
mm=$(ifconfig $i | grep "media")
for j in $opts; do
match=$(echo $mm | grep $j)
if [ ! -z "$match" ]; then
m=$j
break
fi
done
for j in $opts; do
echo "Request: $i -> 802.11 mediaopt $j"
ifconfig $i mediaopt $j >/dev/null 2>&1
echo "Request: $i -> 802.11 -mediaopt $j"
ifconfig $i -mediaopt $j >/dev/null 2>&1
done
if [ ! -z $m ]; then
ifconfig $i mode $m >/dev/null 2>&1
echo "Restored the mediaopt of $i to $m"
fi
ifconfig $i $state
echo "Restored state of $i to $state"
sleep 1
done
/bin/sh /etc/rc.d/hostapd restart >/dev/null 2>&1
/bin/sh /etc/rc.d/wpa_supplicant restart >/dev/null 2>&1
atf_pass
}
atf_test_case modes
modes_head() {
atf_set "require.user" "root"
atf_set "descr" "Test with ifconfig(8) that setting " \
"802.11 modes does not panic (PR kern/45745)"
}
modes_body() {
# Although 11n is not yet supported, the system
# should not panic from invalid input parameters.
# Therefore, the following will try to also set
# the four 802.11 modes for non-802.11 devices.
#
modes="11a 11b 11g 11n"
pkill -9 hostapd
pkill -9 wpa_supplicant
for i in $(ifconfig -l); do
m=""
mm=$(ifconfig $i | grep "media")
for j in $modes; do
match=$(echo $mm | grep $j)
if [ ! -z "$match" ]; then
m=$j
break
fi
done
for j in $modes; do
echo "Request: $i -> 802.11 mode $j"
ifconfig $i mode $j >/dev/null 2>&1
done
if [ ! -z $m ]; then
ifconfig $i mode $m >/dev/null 2>&1
echo "Restored the mode of $i to $m"
fi
done
/bin/sh /etc/rc.d/hostapd restart >/dev/null 2>&1
/bin/sh /etc/rc.d/wpa_supplicant restart >/dev/null 2>&1
atf_pass
}
atf_init_test_cases() {
atf_add_test_case chan
atf_add_test_case mediaopt
atf_add_test_case modes
}