From owner-svn-src-user@FreeBSD.ORG  Sat Apr 11 09:05:44 2015
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id E370C4AE;
 Sat, 11 Apr 2015 09:05:44 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::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 B4F18768;
 Sat, 11 Apr 2015 09:05:44 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3B95iQV091709;
 Sat, 11 Apr 2015 09:05:44 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3B95hKR091705;
 Sat, 11 Apr 2015 09:05:43 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201504110905.t3B95hKR091705@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org
 using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Sat, 11 Apr 2015 09:05:43 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r281426 - in user/ngie/more-tests: etc/mtree tests/sys
 tests/sys/vfs tools/regression/vfs
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.18-1
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 11 Apr 2015 09:05:45 -0000

Author: ngie
Date: Sat Apr 11 09:05:42 2015
New Revision: 281426
URL: https://svnweb.freebsd.org/changeset/base/281426

Log:
  Integration tools/regression/vfs into the FreeBSD test suite

Added:
  user/ngie/more-tests/tests/sys/vfs/
  user/ngie/more-tests/tests/sys/vfs/Makefile   (contents, props changed)
  user/ngie/more-tests/tests/sys/vfs/trailing_slash_test.sh
     - copied, changed from r281415, user/ngie/more-tests/tools/regression/vfs/trailing_slash.t
Deleted:
  user/ngie/more-tests/tools/regression/vfs/
Modified:
  user/ngie/more-tests/etc/mtree/BSD.tests.dist
  user/ngie/more-tests/tests/sys/Makefile

Modified: user/ngie/more-tests/etc/mtree/BSD.tests.dist
==============================================================================
--- user/ngie/more-tests/etc/mtree/BSD.tests.dist	Sat Apr 11 09:05:00 2015	(r281425)
+++ user/ngie/more-tests/etc/mtree/BSD.tests.dist	Sat Apr 11 09:05:42 2015	(r281426)
@@ -394,6 +394,8 @@
         ..
         socket
         ..
+        vfs
+        ..
     ..
     usr.bin
         apply

Modified: user/ngie/more-tests/tests/sys/Makefile
==============================================================================
--- user/ngie/more-tests/tests/sys/Makefile	Sat Apr 11 09:05:00 2015	(r281425)
+++ user/ngie/more-tests/tests/sys/Makefile	Sat Apr 11 09:05:42 2015	(r281426)
@@ -8,6 +8,7 @@ TESTS_SUBDIRS+=		kern
 TESTS_SUBDIRS+=		netinet
 TESTS_SUBDIRS+=		opencrypto
 TESTS_SUBDIRS+=		sockets
+TESTS_SUBDIRS+=		vfs
 
 # Items not integrated into kyua runs by default
 SUBDIR+=		pjdfstest

Added: user/ngie/more-tests/tests/sys/vfs/Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ user/ngie/more-tests/tests/sys/vfs/Makefile	Sat Apr 11 09:05:42 2015	(r281426)
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/sys/vfs
+
+TAP_TESTS_SH+=	trailing_slash_test
+
+.include <bsd.test.mk>

Copied and modified: user/ngie/more-tests/tests/sys/vfs/trailing_slash_test.sh (from r281415, user/ngie/more-tests/tools/regression/vfs/trailing_slash.t)
==============================================================================
--- user/ngie/more-tests/tools/regression/vfs/trailing_slash.t	Sat Apr 11 08:27:38 2015	(r281415, copy source)
+++ user/ngie/more-tests/tests/sys/vfs/trailing_slash_test.sh	Sat Apr 11 09:05:42 2015	(r281426)
@@ -6,8 +6,8 @@
 # point to files.  See kern/21768 for details.  Fixed in r193028.
 #
 
-testfile="/tmp/testfile-$$"
-testlink="/tmp/testlink-$$"
+testfile=$(mktemp tmp.XXXXXX) || exit
+testlink="testlink-$$"
 
 tests="
 $testfile:$testlink:$testfile:0
@@ -18,7 +18,6 @@ $testfile/:$testlink:$testlink:1
 $testfile/:$testlink:$testlink/:1
 "
 
-touch $testfile || exit 1
 trap "rm $testfile $testlink" EXIT
 
 set $tests