diff options
| author | Renato Botelho <renato@netgate.com> | 2016-04-11 14:24:19 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2016-04-11 14:24:19 -0300 |
| commit | 1179a0fb444b0c4221644c27445b51619e5e6584 (patch) | |
| tree | 34609b465d64ad6e0ad1fe61081c9593f7567178 /tests/sys | |
| parent | 35c5ac13568041a87ad1608c84da3ef363431f80 (diff) | |
| parent | c7d52025209c6c0c1673d61a541812bd623ad64f (diff) | |
| download | FreeBSD-src-1179a0fb444b0c4221644c27445b51619e5e6584.zip FreeBSD-src-1179a0fb444b0c4221644c27445b51619e5e6584.tar.gz | |
Merge remote-tracking branch 'origin/stable/10' into devel
Diffstat (limited to 'tests/sys')
| -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 b437183..b03ee43 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 |
