Use a SKIP testplan instead of bailing out if/when the tester isn't
root, or the geom class can't be loaded cleanly [*] This makes sure that scenarios that are easy to hit aren't counted as false positives with kyua test MFC after: 1 week PR: 208101 Sponsored by: EMC / Isilon Storage Division
This commit is contained in:
parent
2e4dba97bd
commit
da611c05f0
@ -35,16 +35,14 @@ geom_test_cleanup()
|
||||
}
|
||||
|
||||
if [ $(id -u) -ne 0 ]; then
|
||||
echo 'Tests must be run as root'
|
||||
echo 'Bail out!'
|
||||
exit 1
|
||||
echo '1..0 # SKIP tests must be run as root'
|
||||
exit 0
|
||||
fi
|
||||
# If the geom class isn't already loaded, try loading it.
|
||||
if ! kldstat -q -m g_${class}; then
|
||||
if ! geom ${class} load; then
|
||||
echo "Could not load module for geom class=${class}"
|
||||
echo 'Bail out!'
|
||||
exit 1
|
||||
echo "1..0 # SKIP could not load module for geom class=${class}"
|
||||
exit 0
|
||||
fi
|
||||
fi
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user