diff options
| author | Enji Cooper <ngie@FreeBSD.org> | 2016-03-22 08:12:45 +0000 |
|---|---|---|
| committer | Enji Cooper <ngie@FreeBSD.org> | 2016-03-22 08:12:45 +0000 |
| commit | da611c05f06ebe38807b14c239bcfd459f571e5f (patch) | |
| tree | 92729a71769bb244faa14a3a0ec2b4f9109e87b5 /tests | |
| parent | 2e4dba97bd9c4db4282ca78c55b9ac2ce19b5088 (diff) | |
| download | src-da611c05f06ebe38807b14c239bcfd459f571e5f.tar.gz src-da611c05f06ebe38807b14c239bcfd459f571e5f.zip | |
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
Notes
Notes:
svn path=/head/; revision=297183
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/sys/geom/class/geom_subr.sh | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/tests/sys/geom/class/geom_subr.sh b/tests/sys/geom/class/geom_subr.sh index b437183efede..b03ee434c4e8 100644 --- a/tests/sys/geom/class/geom_subr.sh +++ b/tests/sys/geom/class/geom_subr.sh @@ -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 |