From owner-svn-src-user@freebsd.org  Mon Nov 16 21:50:04 2015
Return-Path: <owner-svn-src-user@freebsd.org>
Delivered-To: svn-src-user@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 36F8EA31494
 for <svn-src-user@mailman.ysv.freebsd.org>;
 Mon, 16 Nov 2015 21:50:04 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 038E81966;
 Mon, 16 Nov 2015 21:50:03 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tAGLo3c8066146;
 Mon, 16 Nov 2015 21:50:03 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAGLo37d066145;
 Mon, 16 Nov 2015 21:50:03 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201511162150.tAGLo37d066145@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
 ngie@FreeBSD.org using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Mon, 16 Nov 2015 21:50:03 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r290949 - user/ngie/more-tests2/sbin/geom/class/tests
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 16 Nov 2015 21:50:04 -0000

Author: ngie
Date: Mon Nov 16 21:50:02 2015
New Revision: 290949
URL: https://svnweb.freebsd.org/changeset/base/290949

Log:
  - Check for root; all of these tests will fail if not root
  - Add attach_md/geom_test_cleanup functions to deal with the fact that many of the
    tests caused issues if one of the preceding tests failed (sometimes due to a test
    time out), which would cause a cascade of other erroneous failures due to hardcoded
    md(4) device names.

Modified:
  user/ngie/more-tests2/sbin/geom/class/tests/geom_subr.sh

Modified: user/ngie/more-tests2/sbin/geom/class/tests/geom_subr.sh
==============================================================================
--- user/ngie/more-tests2/sbin/geom/class/tests/geom_subr.sh	Mon Nov 16 21:36:50 2015	(r290948)
+++ user/ngie/more-tests2/sbin/geom/class/tests/geom_subr.sh	Mon Nov 16 21:50:02 2015	(r290949)
@@ -1,6 +1,11 @@
 #!/bin/sh
 # $FreeBSD$
 
+if [ $(id -u) -ne 0 ]; then
+	echo 'Tests must be run as root'
+	echo 'Bail out!'
+	exit 1
+fi
 kldstat -q -m g_${class} || g${class} load || exit 1
 
 devwait()
@@ -12,3 +17,29 @@ 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}
+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
+
+	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
+}