From owner-svn-src-all@freebsd.org  Wed Apr  6 06:37:37 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@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 EB506B05E3E;
 Wed,  6 Apr 2016 06:37:37 +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 BC85D1CC2;
 Wed,  6 Apr 2016 06:37:37 +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 u366bahV022502;
 Wed, 6 Apr 2016 06:37:36 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u366baDx022501;
 Wed, 6 Apr 2016 06:37:36 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201604060637.u366baDx022501@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: Wed, 6 Apr 2016 06:37:36 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r297612 - stable/10/tests/sys/geom/class
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 06 Apr 2016 06:37:38 -0000

Author: ngie
Date: Wed Apr  6 06:37:36 2016
New Revision: 297612
URL: https://svnweb.freebsd.org/changeset/base/297612

Log:
  MFC r297183:
  
  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
  
  PR: 208101

Modified:
  stable/10/tests/sys/geom/class/geom_subr.sh
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/tests/sys/geom/class/geom_subr.sh
==============================================================================
--- stable/10/tests/sys/geom/class/geom_subr.sh	Wed Apr  6 05:13:36 2016	(r297611)
+++ stable/10/tests/sys/geom/class/geom_subr.sh	Wed Apr  6 06:37:36 2016	(r297612)
@@ -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