Thu Jun 25 17:08:33 2020 UTC ()
Verify that PR kern/52150 is no longer present.


(jruoho)
diff -r1.852 -r1.853 src/distrib/sets/lists/tests/mi
diff -r1.167 -r1.168 src/etc/mtree/NetBSD.dist.tests
diff -r1.8 -r1.9 src/tests/sbin/Makefile
diff -r0 -r1.1 src/tests/sbin/setkey/Makefile
diff -r0 -r1.1 src/tests/sbin/setkey/t_setkey.sh

cvs diff -r1.852 -r1.853 src/distrib/sets/lists/tests/mi (expand / switch to unified diff)

--- src/distrib/sets/lists/tests/mi 2020/06/25 16:16:49 1.852
+++ src/distrib/sets/lists/tests/mi 2020/06/25 17:08:33 1.853
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: mi,v 1.852 2020/06/25 16:16:49 jruoho Exp $ 1# $NetBSD: mi,v 1.853 2020/06/25 17:08:33 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
@@ -4011,26 +4011,30 @@ @@ -4011,26 +4011,30 @@
4011./usr/tests/sbin/resize_ffs/Kyuafile tests-sbin-tests compattestfile,atf,kyua 4011./usr/tests/sbin/resize_ffs/Kyuafile tests-sbin-tests compattestfile,atf,kyua
4012./usr/tests/sbin/resize_ffs/t_check tests-sbin-tests compattestfile,atf 4012./usr/tests/sbin/resize_ffs/t_check tests-sbin-tests compattestfile,atf
4013./usr/tests/sbin/resize_ffs/t_grow tests-sbin-tests compattestfile,atf 4013./usr/tests/sbin/resize_ffs/t_grow tests-sbin-tests compattestfile,atf
4014./usr/tests/sbin/resize_ffs/t_grow_swapped tests-sbin-tests compattestfile,atf 4014./usr/tests/sbin/resize_ffs/t_grow_swapped tests-sbin-tests compattestfile,atf
4015./usr/tests/sbin/resize_ffs/t_resize_ffs tests-obsolete obsolete 4015./usr/tests/sbin/resize_ffs/t_resize_ffs tests-obsolete obsolete
4016./usr/tests/sbin/resize_ffs/t_shrink tests-sbin-tests compattestfile,atf 4016./usr/tests/sbin/resize_ffs/t_shrink tests-sbin-tests compattestfile,atf
4017./usr/tests/sbin/resize_ffs/t_shrink_swapped tests-sbin-tests compattestfile,atf 4017./usr/tests/sbin/resize_ffs/t_shrink_swapped tests-sbin-tests compattestfile,atf
4018./usr/tests/sbin/resize_ffs/testdata.md5 tests-sbin-tests compattestfile,atf 4018./usr/tests/sbin/resize_ffs/testdata.md5 tests-sbin-tests compattestfile,atf
4019./usr/tests/sbin/resize_ffs/testdata.tar.gz.base64 tests-sbin-tests compattestfile,atf 4019./usr/tests/sbin/resize_ffs/testdata.tar.gz.base64 tests-sbin-tests compattestfile,atf
4020./usr/tests/sbin/route tests-sbin-tests compattestfile,atf 4020./usr/tests/sbin/route tests-sbin-tests compattestfile,atf
4021./usr/tests/sbin/route/Atffile tests-sbin-tests compattestfile,atf 4021./usr/tests/sbin/route/Atffile tests-sbin-tests compattestfile,atf
4022./usr/tests/sbin/route/Kyuafile tests-sbin-tests compattestfile,atf,kyua 4022./usr/tests/sbin/route/Kyuafile tests-sbin-tests compattestfile,atf,kyua
4023./usr/tests/sbin/route/t_missing tests-sbin-tests compattestfile,atf 4023./usr/tests/sbin/route/t_missing tests-sbin-tests compattestfile,atf
 4024./usr/tests/sbin/setkey tests-sbin-tests compattestfile,atf
 4025./usr/tests/sbin/setkey/Atffile tests-sbin-tests compattestfile,atf
 4026./usr/tests/sbin/setkey/Kyuafile tests-sbin-tests compattestfile,atf,kyua
 4027./usr/tests/sbin/setkey/t_setkey tests-sbin-tests compattestfile,atf
4024./usr/tests/sbin/sysctl tests-sbin-tests compattestfile,atf 4028./usr/tests/sbin/sysctl tests-sbin-tests compattestfile,atf
4025./usr/tests/sbin/sysctl/Atffile tests-sbin-tests compattestfile,atf 4029./usr/tests/sbin/sysctl/Atffile tests-sbin-tests compattestfile,atf
4026./usr/tests/sbin/sysctl/Kyuafile tests-sbin-tests compattestfile,atf,kyua 4030./usr/tests/sbin/sysctl/Kyuafile tests-sbin-tests compattestfile,atf,kyua
4027./usr/tests/sbin/sysctl/t_perm tests-sbin-tests compattestfile,atf 4031./usr/tests/sbin/sysctl/t_perm tests-sbin-tests compattestfile,atf
4028./usr/tests/sbin/sysctl/t_sysctl tests-sbin-tests compattestfile,atf 4032./usr/tests/sbin/sysctl/t_sysctl tests-sbin-tests compattestfile,atf
4029./usr/tests/share tests-sys-tests compattestfile,atf 4033./usr/tests/share tests-sys-tests compattestfile,atf
4030./usr/tests/share/Atffile tests-sys-tests compattestfile,atf 4034./usr/tests/share/Atffile tests-sys-tests compattestfile,atf
4031./usr/tests/share/Kyuafile tests-sys-tests compattestfile,atf,kyua 4035./usr/tests/share/Kyuafile tests-sys-tests compattestfile,atf,kyua
4032./usr/tests/share/examples tests-asm-tests compattestfile,atf 4036./usr/tests/share/examples tests-asm-tests compattestfile,atf
4033./usr/tests/share/examples/Atffile tests-asm-tests compattestfile,atf,share 4037./usr/tests/share/examples/Atffile tests-asm-tests compattestfile,atf,share
4034./usr/tests/share/examples/Kyuafile tests-asm-tests compattestfile,atf,share,kyua 4038./usr/tests/share/examples/Kyuafile tests-asm-tests compattestfile,atf,share,kyua
4035./usr/tests/share/examples/lutok tests-lutok-tests compattestfile,atf 4039./usr/tests/share/examples/lutok tests-lutok-tests compattestfile,atf
4036./usr/tests/share/examples/lutok/Atffile tests-lutok-tests compattestfile,atf,kyua,share 4040./usr/tests/share/examples/lutok/Atffile tests-lutok-tests compattestfile,atf,kyua,share

cvs diff -r1.167 -r1.168 src/etc/mtree/NetBSD.dist.tests (expand / switch to unified diff)

--- src/etc/mtree/NetBSD.dist.tests 2020/06/25 15:01:35 1.167
+++ src/etc/mtree/NetBSD.dist.tests 2020/06/25 17:08:33 1.168
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: NetBSD.dist.tests,v 1.167 2020/06/25 15:01:35 jruoho Exp $ 1# $NetBSD: NetBSD.dist.tests,v 1.168 2020/06/25 17:08:33 jruoho Exp $
2 2
3./usr/libdata/debug/usr/tests 3./usr/libdata/debug/usr/tests
4./usr/libdata/debug/usr/tests/atf 4./usr/libdata/debug/usr/tests/atf
5./usr/libdata/debug/usr/tests/atf/atf-c 5./usr/libdata/debug/usr/tests/atf/atf-c
6./usr/libdata/debug/usr/tests/atf/atf-c/detail 6./usr/libdata/debug/usr/tests/atf/atf-c/detail
7./usr/libdata/debug/usr/tests/atf/atf-c++ 7./usr/libdata/debug/usr/tests/atf/atf-c++
8./usr/libdata/debug/usr/tests/atf/atf-c++/detail 8./usr/libdata/debug/usr/tests/atf/atf-c++/detail
9./usr/libdata/debug/usr/tests/atf/formats 9./usr/libdata/debug/usr/tests/atf/formats
10./usr/libdata/debug/usr/tests/atf/test-programs 10./usr/libdata/debug/usr/tests/atf/test-programs
11./usr/libdata/debug/usr/tests/atf/tools 11./usr/libdata/debug/usr/tests/atf/tools
12./usr/libdata/debug/usr/tests/bin 12./usr/libdata/debug/usr/tests/bin
13./usr/libdata/debug/usr/tests/bin/df 13./usr/libdata/debug/usr/tests/bin/df
14./usr/libdata/debug/usr/tests/crypto 14./usr/libdata/debug/usr/tests/crypto
@@ -369,26 +369,27 @@ @@ -369,26 +369,27 @@
369./usr/tests/rump/rumpkern/h_client 369./usr/tests/rump/rumpkern/h_client
370./usr/tests/rump/rumpkern/h_server 370./usr/tests/rump/rumpkern/h_server
371./usr/tests/rump/rumpnet 371./usr/tests/rump/rumpnet
372./usr/tests/rump/rumpvfs 372./usr/tests/rump/rumpvfs
373./usr/tests/sbin 373./usr/tests/sbin
374./usr/tests/sbin/envstat 374./usr/tests/sbin/envstat
375./usr/tests/sbin/fsck_ffs 375./usr/tests/sbin/fsck_ffs
376./usr/tests/sbin/gpt 376./usr/tests/sbin/gpt
377./usr/tests/sbin/ifconfig 377./usr/tests/sbin/ifconfig
378./usr/tests/sbin/newfs 378./usr/tests/sbin/newfs
379./usr/tests/sbin/newfs_msdos 379./usr/tests/sbin/newfs_msdos
380./usr/tests/sbin/resize_ffs 380./usr/tests/sbin/resize_ffs
381./usr/tests/sbin/route 381./usr/tests/sbin/route
 382./usr/tests/sbin/setkey
382./usr/tests/sbin/sysctl 383./usr/tests/sbin/sysctl
383./usr/tests/share 384./usr/tests/share
384./usr/tests/share/examples 385./usr/tests/share/examples
385./usr/tests/share/examples/lutok 386./usr/tests/share/examples/lutok
386./usr/tests/share/mk 387./usr/tests/share/mk
387./usr/tests/sys 388./usr/tests/sys
388./usr/tests/sys/net 389./usr/tests/sys/net
389./usr/tests/sys/netatalk 390./usr/tests/sys/netatalk
390./usr/tests/sys/netinet 391./usr/tests/sys/netinet
391./usr/tests/sys/netinet6 392./usr/tests/sys/netinet6
392./usr/tests/sys/rc 393./usr/tests/sys/rc
393./usr/tests/usr.bin 394./usr/tests/usr.bin
394./usr/tests/usr.bin/awk 395./usr/tests/usr.bin/awk

cvs diff -r1.8 -r1.9 src/tests/sbin/Makefile (expand / switch to unified diff)

--- src/tests/sbin/Makefile 2020/06/25 15:01:35 1.8
+++ src/tests/sbin/Makefile 2020/06/25 17:08:32 1.9
@@ -1,12 +1,12 @@ @@ -1,12 +1,12 @@
1# $NetBSD: Makefile,v 1.8 2020/06/25 15:01:35 jruoho Exp $ 1# $NetBSD: Makefile,v 1.9 2020/06/25 17:08:32 jruoho Exp $
2# 2#
3 3
4.include <bsd.own.mk> 4.include <bsd.own.mk>
5 5
6TESTSDIR= ${TESTSBASE}/sbin 6TESTSDIR= ${TESTSBASE}/sbin
7 7
8TESTS_SUBDIRS+= envstat fsck_ffs gpt ifconfig \ 8TESTS_SUBDIRS+= envstat fsck_ffs gpt ifconfig \
9 newfs newfs_msdos resize_ffs \ 9 newfs newfs_msdos resize_ffs \
10 route sysctl 10 route setkey sysctl
11 11
12.include <bsd.test.mk> 12.include <bsd.test.mk>

File Added: src/tests/sbin/setkey/Makefile
# $NetBSD: Makefile,v 1.1 2020/06/25 17:08:32 jruoho Exp $

.include <bsd.own.mk>

TESTSDIR=	${TESTSBASE}/sbin/setkey

TESTS_SH=	t_setkey

.include <bsd.test.mk>

File Added: src/tests/sbin/setkey/t_setkey.sh
# $NetBSD: t_setkey.sh,v 1.1 2020/06/25 17:08:32 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 invalid_length
invalid_length_head() {
	atf_require_prog "setkey"
	atf_set "require.user" "root"
	atf_set "descr" "Test with setkey(8) that setting a key " \
		"with invalid length does not panic (PR kern/52150)"
}

invalid_length_body() {
	atf_check -s exit:1 -o ignore -e not-empty \
		  -x "setkey add 10.0.0.1 10.0.0.2 esp 10000 " \
		     "-E aes-gmac \"hogehogehogehogehogehoge\""
}

atf_init_test_cases() {
	atf_add_test_case invalid_length
}