Merge remote-tracking branch 'origin/stable/10' into develdevel

2 files changed, 11 insertions, 4 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		\
diff --git a/contrib/netbsd-tests/dev/sysmon/t_swwdog.c b/contrib/netbsd-tests/dev/sysmon/t_swwdog.c
index 19e3795..1635884 100644
--- a/contrib/netbsd-tests/dev/sysmon/t_swwdog.c
+++ b/contrib/netbsd-tests/dev/sysmon/t_swwdog.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: t_swwdog.c,v 1.5 2011/06/26 12:14:59 christos Exp $	*/
+/*	$NetBSD: t_swwdog.c,v 1.6 2015/04/23 04:49:37 pgoyette Exp $	*/
 
 /*
  * Copyright (c) 2010 Antti Kantee.  All Rights Reserved.
@@ -121,6 +121,7 @@ testbody(int max)
 		_exit(2);
 	}
 	/* fail */
+	printf("no watchdog registered!\n");
 	_exit(1);
 }