svn commit: r281426 - in user/ngie/more-tests: etc/mtree tests/sys tests/sys/vfs tools/regression/vfs

[Garrett Cooper]

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