From owner-svn-src-user@freebsd.org  Fri Jan  1 00:16:56 2016
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 12E37A57A3D
 for <svn-src-user@mailman.ysv.freebsd.org>;
 Fri,  1 Jan 2016 00:16:56 +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 CE5C6124E;
 Fri,  1 Jan 2016 00:16:55 +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 u010GsMj006442;
 Fri, 1 Jan 2016 00:16:54 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u010GsRg006441;
 Fri, 1 Jan 2016 00:16:54 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201601010016.u010GsRg006441@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: Fri, 1 Jan 2016 00:16:54 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r293021 - user/ngie/more-tests2/tests/sys/geom/class/uzip
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: Fri, 01 Jan 2016 00:16:56 -0000

Author: ngie
Date: Fri Jan  1 00:16:54 2016
New Revision: 293021
URL: https://svnweb.freebsd.org/changeset/base/293021

Log:
  Only try to unmount/remove mountpt if it's defined

Modified:
  user/ngie/more-tests2/tests/sys/geom/class/uzip/conf.sh

Modified: user/ngie/more-tests2/tests/sys/geom/class/uzip/conf.sh
==============================================================================
--- user/ngie/more-tests2/tests/sys/geom/class/uzip/conf.sh	Fri Jan  1 00:13:04 2016	(r293020)
+++ user/ngie/more-tests2/tests/sys/geom/class/uzip/conf.sh	Fri Jan  1 00:16:54 2016	(r293021)
@@ -6,8 +6,10 @@ base=`basename $0`
 
 uzip_test_cleanup()
 {
-	umount $mntpoint
-	rmdir $mntpoint
+	if [ -n "$mntpoint" ]; then
+		umount $mntpoint
+		rmdir $mntpoint
+	fi
 	geom_test_cleanup
 }
 trap uzip_test_cleanup ABRT EXIT INT TERM