Module Name: src
Committed By: riastradh
Date: Sun Jun 13 14:45:36 UTC 2021
Modified Files:
src/tests/dev/sysmon: t_swsensor.sh
Log Message:
tests/dev/sysmon: Query bits of data, not bits of entropy.
Fixes PR kern/47661.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/tests/dev/sysmon/t_swsensor.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/dev/sysmon/t_swsensor.sh
diff -u src/tests/dev/sysmon/t_swsensor.sh:1.11 src/tests/dev/sysmon/t_swsensor.sh:1.12
--- src/tests/dev/sysmon/t_swsensor.sh:1.11 Sat Mar 21 04:50:21 2020
+++ src/tests/dev/sysmon/t_swsensor.sh Sun Jun 13 14:45:36 2021
@@ -1,4 +1,4 @@
-# $NetBSD: t_swsensor.sh,v 1.11 2020/03/21 04:50:21 pgoyette Exp $
+# $NetBSD: t_swsensor.sh,v 1.12 2021/06/13 14:45:36 riastradh Exp $
get_sensor_info() {
rump.envstat -x | \
@@ -24,7 +24,7 @@ get_rnd_bits_count() {
RUMP_SERVER=unix://t_swsensor_socket \
LD_PRELOAD=/usr/lib/librumphijack.so rndctl -l | \
grep "swsensor-sensor" | \
- awk '{print $2}'
+ awk '{print $3}'
}
check_powerd_event() {
@@ -296,19 +296,16 @@ common_body() {
sleep 5
new_rnd_bits=$( get_rnd_bits_count )
if [ $new_rnd_bits -le $rnd_bits ] ; then
- atf_expect_fail "PR kern/47661"
atf_fail "14a: entropy bits did not increase after polling"
fi
rnd_bits=$new_rnd_bits
sleep 5
new_rnd_bits=$( get_rnd_bits_count )
if [ $new_rnd_bits -gt $rnd_bits ] ; then
- atf_expect_fail "PR kern/47661"
atf_fail "14b: entropy bits increased after poll with no value change"
fi
# Step 15 - make sure entropy collected when device is interrogated
- #
rump.envstat -c env0.conf
rump.sysctl -w hw.swsensor.cur_value=$3
get_sensor_key cur-value
@@ -317,14 +314,12 @@ common_body() {
get_sensor_key cur-value
new_rnd_bits=$( get_rnd_bits_count )
if [ $new_rnd_bits -le $rnd_bits ] ; then
- atf_expect_fail "PR kern/47661"
atf_fail "15a: entropy bits did not increase after interrogation"
fi
rnd_bits=$new_rnd_bits
get_sensor_key cur-value
new_rnd_bits=$( get_rnd_bits_count )
if [ $new_rnd_bits -gt $rnd_bits ] ; then
- atf_expect_fail "PR kern/47661"
atf_fail "15b: entropy bits increased after interrogation with no value change"
fi
}
