- Use geom <class> load instead of g<class> load; g<class> doesn't exist

  for all geom classes, e.g. geom_uzip(4)
- These tests require root. Skip all of the tests if they're run as non-root

MFC after: 2 weeks
Sponsored by: EMC / Isilon Storage Division

1 files changed, 6 insertions, 1 deletions

diff --git a/tools/regression/geom_subr.sh b/tools/regression/geom_subr.sh
index 6047829..8bc69c6 100644
--- a/tools/regression/geom_subr.sh
+++ b/tools/regression/geom_subr.sh
@@ -1,7 +1,12 @@
 #!/bin/sh
 # $FreeBSD$
 
-kldstat -q -m g_${class} || g${class} load || exit 1
+if [ $(id -u) -ne 0 ]; then
+	echo 'Tests must be run as root'
+	echo 'Bail out!'
+	exit 1
+fi
+kldstat -q -m g_${class} || geom ${class} load || exit 1
 
 devwait()
 {