From owner-svn-src-all@freebsd.org  Fri Dec  9 23:44:27 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 2C75EC6FED3;
 Fri,  9 Dec 2016 23:44:27 +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 E9743148A;
 Fri,  9 Dec 2016 23:44:26 +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 uB9NiQPu032077;
 Fri, 9 Dec 2016 23:44:26 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id uB9NiQxN032075;
 Fri, 9 Dec 2016 23:44:26 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201612092344.uB9NiQxN032075@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
 ngie@FreeBSD.org using -f
From: Ngie Cooper <ngie@FreeBSD.org>
Date: Fri, 9 Dec 2016 23:44:26 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r309780 - head/contrib/netbsd-tests/fs/tmpfs
X-SVN-Group: head
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.23
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: Fri, 09 Dec 2016 23:44:27 -0000

Author: ngie
Date: Fri Dec  9 23:44:25 2016
New Revision: 309780
URL: https://svnweb.freebsd.org/changeset/base/309780

Log:
  Use _test_unmount instead of test_unmount in cleanup to avoid
  false positives with atf_check when tmpfs is not loaded, etc
  
  MFC after:	1 week

Modified:
  head/contrib/netbsd-tests/fs/tmpfs/t_link.sh
  head/contrib/netbsd-tests/fs/tmpfs/t_remove.sh

Modified: head/contrib/netbsd-tests/fs/tmpfs/t_link.sh
==============================================================================
--- head/contrib/netbsd-tests/fs/tmpfs/t_link.sh	Fri Dec  9 23:43:33 2016	(r309779)
+++ head/contrib/netbsd-tests/fs/tmpfs/t_link.sh	Fri Dec  9 23:44:25 2016	(r309780)
@@ -97,7 +97,7 @@ subdirs_body() {
 if true; then
 atf_test_case kqueue cleanup
 kqueue_cleanup() {
-	Mount_Point=$(pwd)/mntpt test_unmount || :
+	Mount_Point=$(pwd)/mntpt _test_unmount || :
 }
 else
 # End FreeBSD

Modified: head/contrib/netbsd-tests/fs/tmpfs/t_remove.sh
==============================================================================
--- head/contrib/netbsd-tests/fs/tmpfs/t_remove.sh	Fri Dec  9 23:43:33 2016	(r309779)
+++ head/contrib/netbsd-tests/fs/tmpfs/t_remove.sh	Fri Dec  9 23:44:25 2016	(r309780)
@@ -50,7 +50,7 @@ single_body() {
 if true; then
 atf_test_case uchg cleanup
 uchg_cleanup() {
-	Mount_Point=$(pwd)/mntpt test_unmount || :
+	Mount_Point=$(pwd)/mntpt _test_unmount
 }
 else
 # End FreeBSD