diff options
author | ngie <ngie@FreeBSD.org> | 2016-12-03 02:47:16 +0000 |
---|---|---|
committer | ngie <ngie@FreeBSD.org> | 2016-12-03 02:47:16 +0000 |
commit | 29db3b90328498474388e9cfb2c8ef6d816c05c2 (patch) | |
tree | 91ac81530a80d5ea64a24212d143cb2012f49a0a /contrib/netbsd-tests/dev/sysmon/t_swsensor.sh | |
parent | 8408238ce58163c0d88dea333c155b6806aae830 (diff) | |
download | FreeBSD-src-29db3b90328498474388e9cfb2c8ef6d816c05c2.zip FreeBSD-src-29db3b90328498474388e9cfb2c8ef6d816c05c2.tar.gz |
MFC r305358:
Update contrib/netbsd-tests with new content from NetBSD
This updates the snapshot from 09/30/2014 to 08/11/2016
This brings in a number of new testcases from upstream, most
notably:
- bin/cat
- lib/libc
- lib/msun
- lib/libthr
- usr.bin/sort
lib/libc/tests/stdio/open_memstream_test.c was moved to
lib/libc/tests/stdio/open_memstream2_test.c to accomodate
the new open_memstream test from NetBSD.
Tested on: amd64 (VMware fusion VM; various bare metal platforms); i386 (VMware fusion VM); make tinderbox
Diffstat (limited to 'contrib/netbsd-tests/dev/sysmon/t_swsensor.sh')
-rwxr-xr-x | contrib/netbsd-tests/dev/sysmon/t_swsensor.sh | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/contrib/netbsd-tests/dev/sysmon/t_swsensor.sh b/contrib/netbsd-tests/dev/sysmon/t_swsensor.sh index 5b54431..7f98c1a 100755 --- a/contrib/netbsd-tests/dev/sysmon/t_swsensor.sh +++ b/contrib/netbsd-tests/dev/sysmon/t_swsensor.sh @@ -1,4 +1,4 @@ -# $NetBSD: t_swsensor.sh,v 1.7 2013/04/14 16:07:46 martin Exp $ +# $NetBSD: t_swsensor.sh,v 1.9 2015/04/23 23:23:28 pgoyette Exp $ get_sensor_info() { rump.envstat -x | \ @@ -6,7 +6,13 @@ get_sensor_info() { } get_sensor_key() { - get_sensor_info | grep -A1 $1 | grep integer | sed -e 's;<[/a-z]*>;;g' + local v + v=$(get_sensor_info | grep -A1 $1 | grep integer | \ + sed -e 's;<[/a-z]*>;;g') + if [ -z "$v" ] ; then + v="key_$1_not_found" + fi + echo $v } get_powerd_event_count() { @@ -60,7 +66,7 @@ start_rump() { common_head() { atf_set descr "$1" - atf_set timeout 60 + atf_set timeout 120 atf_set require.progs rump.powerd rump.envstat rump.modload \ rump.halt rump.sysctl rump_server \ sed grep awk \ |