svn commit: r294065 - stable/9/tools/regression

[Garrett Cooper]

Author: ngie
Date: Fri Jan 15 02:19:26 2016
New Revision: 294065
URL: https://svnweb.freebsd.org/changeset/base/294065

Log:
  MFstable/10 r294063:
  
  MFC r293028,r293029:
  
  r293028:
  
  - 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
  
  r293029:
  
  Add functions for managing md(4) devices and cleaning up said md(4) devices
  
  These will be used soon in the various test scripts that source geom_subr.sh

Modified:
  stable/9/tools/regression/geom_subr.sh
Directory Properties:
  stable/9/   (props changed)
  stable/9/tools/   (props changed)
  stable/9/tools/regression/   (props changed)

Modified: stable/9/tools/regression/geom_subr.sh
==============================================================================
--- stable/9/tools/regression/geom_subr.sh	Fri Jan 15 02:14:49 2016	(r294064)
+++ stable/9/tools/regression/geom_subr.sh	Fri Jan 15 02:19:26 2016	(r294065)
@@ -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()
 {
@@ -12,3 +17,32 @@ devwait()
 		sleep 0.2
 	done
 }
+
+# Need to keep track of the test md devices to avoid the scenario where a test
+# failing will cause the other tests to bomb out, or a test failing will leave
+# a large number of md(4) devices lingering around
+: ${TMPDIR=/tmp}
+export TMPDIR
+TEST_MDS_FILE=${TMPDIR}/test_mds
+
+attach_md()
+{
+	local test_md
+
+	test_md=$(mdconfig -a "$@") || exit
+	echo $test_md >> $TEST_MDS_FILE || exit
+	echo $test_md
+}
+
+geom_test_cleanup()
+{
+	local test_md
+
+	if [ -f $TEST_MDS_FILE ]; then
+		while read test_md; do
+			# The "#" tells the TAP parser this is a comment
+			echo "# Removing test memory disk: $test_md"
+			mdconfig -d -u $test_md
+		done < $TEST_MDS_FILE
+	fi
+}