Author: ngie
Date: Fri Oct 21 05:24:08 2016
New Revision: 307702
URL: https://svnweb.freebsd.org/changeset/base/307702

Log:
  Integrate contrib/netbsd-tests/fs/tmpfs into the FreeBSD test suite
  as tests/sys/fs
  
  These testcases exercise tmpfs support
  
  MFC after:    2 weeks
  Sponsored by: Dell EMC Isilon

Added:
  head/tests/sys/fs/
  head/tests/sys/fs/Makefile   (contents, props changed)
  head/tests/sys/fs/tmpfs/
  head/tests/sys/fs/tmpfs/Makefile   (contents, props changed)
Modified:
  head/etc/mtree/BSD.tests.dist
  head/tests/sys/Makefile

Modified: head/etc/mtree/BSD.tests.dist
==============================================================================
--- head/etc/mtree/BSD.tests.dist       Fri Oct 21 05:21:20 2016        
(r307701)
+++ head/etc/mtree/BSD.tests.dist       Fri Oct 21 05:24:08 2016        
(r307702)
@@ -396,6 +396,10 @@
         ..
         file
         ..
+        fs
+            tmpfs
+            ..
+        ..
         geom
             class
                 concat

Modified: head/tests/sys/Makefile
==============================================================================
--- head/tests/sys/Makefile     Fri Oct 21 05:21:20 2016        (r307701)
+++ head/tests/sys/Makefile     Fri Oct 21 05:24:08 2016        (r307702)
@@ -6,6 +6,7 @@ TESTS_SUBDIRS+=         acl
 TESTS_SUBDIRS+=                aio
 TESTS_SUBDIRS+=                fifo
 TESTS_SUBDIRS+=                file
+TESTS_SUBDIRS+=                fs
 TESTS_SUBDIRS+=                geom
 TESTS_SUBDIRS+=                kern
 TESTS_SUBDIRS+=                kqueue

Added: head/tests/sys/fs/Makefile
==============================================================================
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ head/tests/sys/fs/Makefile  Fri Oct 21 05:24:08 2016        (r307702)
@@ -0,0 +1,23 @@
+# $FreeBSD$
+
+PACKAGE=               tests
+
+TESTSDIR=              ${TESTSBASE}/sys/fs
+
+TESTSRC=               ${SRCTOP}/contrib/netbsd-tests/fs
+
+#TESTS_SUBDIRS+=       nullfs  # XXX: needs rump
+TESTS_SUBDIRS+=                tmpfs
+
+${PACKAGE}FILES+=      h_funcs.subr
+${PACKAGE}FILESDIR=    ${TESTSDIR}
+
+CLEANFILES+=           h_funcs.subr
+CLEANFILES+=           h_funcs.subr.tmp
+
+h_funcs.subr: ${TESTSRC}/h_funcs.subr
+       cat ${.ALLSRC} | \
+           sed -e '/atf_require_prog mount_$${name}/d' >>${.TARGET}.tmp
+       mv ${.TARGET}.tmp ${.TARGET}
+
+.include <bsd.test.mk>

Added: head/tests/sys/fs/tmpfs/Makefile
==============================================================================
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ head/tests/sys/fs/tmpfs/Makefile    Fri Oct 21 05:24:08 2016        
(r307702)
@@ -0,0 +1,56 @@
+# $FreeBSD$
+
+PACKAGE=               tests
+
+FILESYSTEM?=           ${.CURDIR:T}
+
+TESTSDIR=              ${TESTSBASE}/sys/fs/${FILESYSTEM}
+
+TESTSRC=               ${SRCTOP}/contrib/netbsd-tests/fs/${FILESYSTEM}
+
+# XXX: uses /dev/MAKEDEV to create pseudo /dev/{null,zero} character devices
+#NETBSD_ATF_TESTS_SH+= devices_test
+NETBSD_ATF_TESTS_SH+=  create_test
+NETBSD_ATF_TESTS_SH+=  read_write_test
+NETBSD_ATF_TESTS_SH+=  dots_test
+NETBSD_ATF_TESTS_SH+=  exec_test
+NETBSD_ATF_TESTS_SH+=  link_test
+NETBSD_ATF_TESTS_SH+=  mkdir_test
+NETBSD_ATF_TESTS_SH+=  mknod_test
+NETBSD_ATF_TESTS_SH+=  mount_test
+# XXX: need to replace `mknod ... p` with something more sensible
+#NETBSD_ATF_TESTS_SH+= pipes_test
+NETBSD_ATF_TESTS_SH+=  trail_slash_test
+NETBSD_ATF_TESTS_SH+=  readdir_test
+NETBSD_ATF_TESTS_SH+=  remove_test
+NETBSD_ATF_TESTS_SH+=  rename_test
+NETBSD_ATF_TESTS_SH+=  rmdir_test
+NETBSD_ATF_TESTS_SH+=  setattr_test
+NETBSD_ATF_TESTS_SH+=  sizes_test
+NETBSD_ATF_TESTS_SH+=  sockets_test
+NETBSD_ATF_TESTS_SH+=  statvfs_test
+NETBSD_ATF_TESTS_SH+=  symlink_test
+NETBSD_ATF_TESTS_SH+=  times_test
+NETBSD_ATF_TESTS_SH+=  truncate_test
+NETBSD_ATF_TESTS_SH+=  vnd_test
+NETBSD_ATF_TESTS_SH+=  vnode_leak_test
+
+${PACKAGE}FILES+=      h_funcs.subr
+${PACKAGE}FILESDIR=    ${TESTSDIR}
+
+PROGS+=                        h_tools
+BINDIR.h_tools=                ${TESTSDIR}
+
+ATF_TESTS_SH_SED_mount_test=           \
+                                       -e 's,-o -g,-o gid=,g' \
+                                       -e 's,-o -m,-o mode=,g' \
+                                       -e 's,-o -s,-o size=,g' \
+                                       -e 's,-o -u,-o uid=,g' \
+                                       -e 's,mount_${FILESYSTEM},mount -t 
${FILESYSTEM},g'
+ATF_TESTS_SH_SED_sizes_test=           -e 's,-o -s,-o size=,g'
+ATF_TESTS_SH_SED_statvfs_test=         -e 's,-o -s,-o size=,g'
+ATF_TESTS_SH_SED_vnode_leak_test=      -e 's,-o -s,-o size=,g'
+
+.include <netbsd-tests.test.mk>
+
+.include <bsd.test.mk>
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "[email protected]"

Reply via email to