Thu Jun 25 15:01:36 2020 UTC ()
Add a test case for PR kern/53410.


(jruoho)
diff -r1.849 -r1.850 src/distrib/sets/lists/tests/mi
diff -r1.166 -r1.167 src/etc/mtree/NetBSD.dist.tests
diff -r1.7 -r1.8 src/tests/sbin/Makefile
diff -r0 -r1.1 src/tests/sbin/envstat/Makefile
diff -r0 -r1.1 src/tests/sbin/envstat/t_envstat.sh

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

--- src/distrib/sets/lists/tests/mi 2020/06/25 14:24:45 1.849
+++ src/distrib/sets/lists/tests/mi 2020/06/25 15:01:35 1.850
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: mi,v 1.849 2020/06/25 14:24:45 jruoho Exp $ 1# $NetBSD: mi,v 1.850 2020/06/25 15:01:35 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
@@ -3957,26 +3957,30 @@ @@ -3957,26 +3957,30 @@
3957./usr/tests/rump/rumpnet tests-rump-tests compattestfile,atf 3957./usr/tests/rump/rumpnet tests-rump-tests compattestfile,atf
3958./usr/tests/rump/rumpnet/Atffile tests-rump-tests atf,rump 3958./usr/tests/rump/rumpnet/Atffile tests-rump-tests atf,rump
3959./usr/tests/rump/rumpnet/Kyuafile tests-rump-tests atf,rump,kyua 3959./usr/tests/rump/rumpnet/Kyuafile tests-rump-tests atf,rump,kyua
3960./usr/tests/rump/rumpnet/t_shmif tests-rump-tests atf,rump 3960./usr/tests/rump/rumpnet/t_shmif tests-rump-tests atf,rump
3961./usr/tests/rump/rumpvfs tests-rump-tests compattestfile,atf 3961./usr/tests/rump/rumpvfs tests-rump-tests compattestfile,atf
3962./usr/tests/rump/rumpvfs/Atffile tests-rump-tests atf,rump 3962./usr/tests/rump/rumpvfs/Atffile tests-rump-tests atf,rump
3963./usr/tests/rump/rumpvfs/Kyuafile tests-rump-tests atf,rump,kyua 3963./usr/tests/rump/rumpvfs/Kyuafile tests-rump-tests atf,rump,kyua
3964./usr/tests/rump/rumpvfs/t_basic tests-rump-tests atf,rump 3964./usr/tests/rump/rumpvfs/t_basic tests-rump-tests atf,rump
3965./usr/tests/rump/rumpvfs/t_etfs tests-rump-tests atf,rump 3965./usr/tests/rump/rumpvfs/t_etfs tests-rump-tests atf,rump
3966./usr/tests/rump/rumpvfs/t_p2kifs tests-rump-tests atf,rump 3966./usr/tests/rump/rumpvfs/t_p2kifs tests-rump-tests atf,rump
3967./usr/tests/sbin tests-sbin-tests compattestfile,atf 3967./usr/tests/sbin tests-sbin-tests compattestfile,atf
3968./usr/tests/sbin/Atffile tests-sbin-tests compattestfile,atf 3968./usr/tests/sbin/Atffile tests-sbin-tests compattestfile,atf
3969./usr/tests/sbin/Kyuafile tests-sbin-tests compattestfile,atf,kyua 3969./usr/tests/sbin/Kyuafile tests-sbin-tests compattestfile,atf,kyua
 3970./usr/tests/sbin/envstat tests-sbin-tests compattestfile,atf
 3971./usr/tests/sbin/envstat/Atffile tests-sbin-tests compattestfile,atf
 3972./usr/tests/sbin/envstat/Kyuafile tests-sbin-tests compattestfile,atf,kyua
 3973./usr/tests/sbin/envstat/t_envstat tests-sbin-tests compattestfile,atf
3970./usr/tests/sbin/fsck_ffs tests-sbin-tests compattestfile,atf 3974./usr/tests/sbin/fsck_ffs tests-sbin-tests compattestfile,atf
3971./usr/tests/sbin/fsck_ffs/Atffile tests-sbin-tests compattestfile,atf 3975./usr/tests/sbin/fsck_ffs/Atffile tests-sbin-tests compattestfile,atf
3972./usr/tests/sbin/fsck_ffs/Kyuafile tests-sbin-tests compattestfile,atf,kyua 3976./usr/tests/sbin/fsck_ffs/Kyuafile tests-sbin-tests compattestfile,atf,kyua
3973./usr/tests/sbin/fsck_ffs/t_check_quotas tests-sbin-tests compattestfile,atf 3977./usr/tests/sbin/fsck_ffs/t_check_quotas tests-sbin-tests compattestfile,atf
3974./usr/tests/sbin/fsck_ffs/t_enable_quotas tests-sbin-tests compattestfile,atf 3978./usr/tests/sbin/fsck_ffs/t_enable_quotas tests-sbin-tests compattestfile,atf
3975./usr/tests/sbin/gpt tests-sbin-tests compattestfile,atf 3979./usr/tests/sbin/gpt tests-sbin-tests compattestfile,atf
3976./usr/tests/sbin/gpt/Atffile tests-sbin-tests compattestfile,atf 3980./usr/tests/sbin/gpt/Atffile tests-sbin-tests compattestfile,atf
3977./usr/tests/sbin/gpt/Kyuafile tests-sbin-tests compattestfile,atf,kyua 3981./usr/tests/sbin/gpt/Kyuafile tests-sbin-tests compattestfile,atf,kyua
3978./usr/tests/sbin/gpt/gpt.2part.show.label tests-sbin-tests compattestfile,atf 3982./usr/tests/sbin/gpt/gpt.2part.show.label tests-sbin-tests compattestfile,atf
3979./usr/tests/sbin/gpt/gpt.2part.show.normal tests-sbin-tests compattestfile,atf 3983./usr/tests/sbin/gpt/gpt.2part.show.normal tests-sbin-tests compattestfile,atf
3980./usr/tests/sbin/gpt/gpt.2part.show.uuid tests-sbin-tests compattestfile,atf 3984./usr/tests/sbin/gpt/gpt.2part.show.uuid tests-sbin-tests compattestfile,atf
3981./usr/tests/sbin/gpt/gpt.backup tests-sbin-tests compattestfile,atf 3985./usr/tests/sbin/gpt/gpt.backup tests-sbin-tests compattestfile,atf
3982./usr/tests/sbin/gpt/gpt.disklabel tests-sbin-tests compattestfile,atf 3986./usr/tests/sbin/gpt/gpt.disklabel tests-sbin-tests compattestfile,atf

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

--- src/etc/mtree/NetBSD.dist.tests 2020/06/24 10:05:07 1.166
+++ src/etc/mtree/NetBSD.dist.tests 2020/06/25 15:01:35 1.167
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: NetBSD.dist.tests,v 1.166 2020/06/24 10:05:07 jruoho Exp $ 1# $NetBSD: NetBSD.dist.tests,v 1.167 2020/06/25 15:01:35 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
@@ -361,26 +361,27 @@ @@ -361,26 +361,27 @@
361./usr/tests/net/net 361./usr/tests/net/net
362./usr/tests/net/ndp 362./usr/tests/net/ndp
363./usr/tests/net/npf 363./usr/tests/net/npf
364./usr/tests/net/route 364./usr/tests/net/route
365./usr/tests/net/sys 365./usr/tests/net/sys
366./usr/tests/rump 366./usr/tests/rump
367./usr/tests/rump/modautoload 367./usr/tests/rump/modautoload
368./usr/tests/rump/rumpkern 368./usr/tests/rump/rumpkern
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/fsck_ffs 375./usr/tests/sbin/fsck_ffs
375./usr/tests/sbin/gpt 376./usr/tests/sbin/gpt
376./usr/tests/sbin/ifconfig 377./usr/tests/sbin/ifconfig
377./usr/tests/sbin/newfs 378./usr/tests/sbin/newfs
378./usr/tests/sbin/newfs_msdos 379./usr/tests/sbin/newfs_msdos
379./usr/tests/sbin/resize_ffs 380./usr/tests/sbin/resize_ffs
380./usr/tests/sbin/route 381./usr/tests/sbin/route
381./usr/tests/sbin/sysctl 382./usr/tests/sbin/sysctl
382./usr/tests/share 383./usr/tests/share
383./usr/tests/share/examples 384./usr/tests/share/examples
384./usr/tests/share/examples/lutok 385./usr/tests/share/examples/lutok
385./usr/tests/share/mk 386./usr/tests/share/mk
386./usr/tests/sys 387./usr/tests/sys

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

--- src/tests/sbin/Makefile 2015/12/04 17:20:38 1.7
+++ src/tests/sbin/Makefile 2020/06/25 15:01:35 1.8
@@ -1,10 +1,12 @@ @@ -1,10 +1,12 @@
1# $NetBSD: Makefile,v 1.7 2015/12/04 17:20:38 christos Exp $ 1# $NetBSD: Makefile,v 1.8 2020/06/25 15:01:35 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+= fsck_ffs gpt ifconfig newfs newfs_msdos resize_ffs route sysctl 8TESTS_SUBDIRS+= envstat fsck_ffs gpt ifconfig \
 9 newfs newfs_msdos resize_ffs \
 10 route sysctl
9 11
10.include <bsd.test.mk> 12.include <bsd.test.mk>

File Added: src/tests/sbin/envstat/Makefile
# $NetBSD: Makefile,v 1.1 2020/06/25 15:01:35 jruoho Exp $

.include <bsd.own.mk>

TESTSDIR=	${TESTSBASE}/sbin/envstat
TESTS_SH=	t_envstat

.include <bsd.test.mk>

File Added: src/tests/sbin/envstat/t_envstat.sh
# $NetBSD: t_envstat.sh,v 1.1 2020/06/25 15:01:35 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 zerotemp
zerotemp_head() {
	atf_set "descr" "Check with envstat(8) that CPU sensors " \
		"do not show zero temperatures (PR kern/53410)"
}

zerotemp_body() {

	devices="amdtemp0 coretemp0 acpitz0" # XXX: What else?

	for dev in $devices; do

		envstat -d $dev >/dev/null 2>&1

		if [ ! $? -eq 0 ]; then
			echo "Skipping non-existent $dev"
			continue
		fi

		if [ $dev = "amdtemp0" ]; then
			atf_expect_fail "PR kern/53410"
		fi

		tempf=$(envstat -d $dev | awk '/Current/{getline;print $3}')
		tempi=$(printf "%.0f" $tempf)

		echo "$dev = $tempf =~ $tempi"

		if [ $tempi -eq 0 ]; then
			atf_fail "Zero-temperature from $dev"
		fi
	done
}

atf_init_test_cases() {
	atf_add_test_case zerotemp
}