svn commit: r282067 - in head: etc/mtree tests/sys tests/sys/fifo tests/sys/file tools/regression/fifo tools/regression/file/dup tools/regression/file/fcntlflags tools/regression/file/flock tools/r...

Garrett Cooper ngie at FreeBSD.org
Mon Apr 27 08:15:19 UTC 2015


Author: ngie
Date: Mon Apr 27 08:15:17 2015
New Revision: 282067
URL: https://svnweb.freebsd.org/changeset/base/282067

Log:
  Integrate tools/regression/fifo into the FreeBSD test suite as tests/sys/fifo
  and tools/regression/file into the FreeBSD test suite as tests/sys/file
  
  MFC after: 1 week

Added:
  head/tests/sys/fifo/
     - copied from r281450, user/ngie/more-tests/tests/sys/fifo/
  head/tests/sys/fifo/Makefile
     - copied unchanged from r281485, user/ngie/more-tests/tests/sys/fifo/Makefile
  head/tests/sys/file/
     - copied from r281432, user/ngie/more-tests/tests/sys/file/
  head/tests/sys/file/Makefile
     - copied unchanged from r281485, user/ngie/more-tests/tests/sys/file/Makefile
Deleted:
  head/tools/regression/fifo/
  head/tools/regression/file/dup/
  head/tools/regression/file/fcntlflags/
  head/tools/regression/file/flock/
  head/tools/regression/file/ftruncate/
  head/tools/regression/file/newfileops_on_fork/
Modified:
  head/etc/mtree/BSD.tests.dist
  head/tests/sys/Makefile
  head/tests/sys/file/closefrom_test.c
Directory Properties:
  head/   (props changed)
  head/etc/   (props changed)

Modified: head/etc/mtree/BSD.tests.dist
==============================================================================
--- head/etc/mtree/BSD.tests.dist	Mon Apr 27 08:06:33 2015	(r282066)
+++ head/etc/mtree/BSD.tests.dist	Mon Apr 27 08:15:17 2015	(r282067)
@@ -354,6 +354,10 @@
         ..
     ..
     sys
+        fifo
+        ..
+        file
+        ..
         kern
             execve
             ..

Modified: head/tests/sys/Makefile
==============================================================================
--- head/tests/sys/Makefile	Mon Apr 27 08:06:33 2015	(r282066)
+++ head/tests/sys/Makefile	Mon Apr 27 08:15:17 2015	(r282067)
@@ -4,6 +4,8 @@
 
 TESTSDIR= ${TESTSBASE}/sys
 
+TESTS_SUBDIRS+=		fifo
+TESTS_SUBDIRS+=		file
 TESTS_SUBDIRS+=		kern
 TESTS_SUBDIRS+=		kqueue
 TESTS_SUBDIRS+=		netinet

Copied: head/tests/sys/fifo/Makefile (from r281485, user/ngie/more-tests/tests/sys/fifo/Makefile)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/tests/sys/fifo/Makefile	Mon Apr 27 08:15:17 2015	(r282067, copy of r281485, user/ngie/more-tests/tests/sys/fifo/Makefile)
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/sys/fifo
+
+PLAIN_TESTS_C+=	fifo_create
+PLAIN_TESTS_C+=	fifo_io
+PLAIN_TESTS_C+=	fifo_misc
+PLAIN_TESTS_C+=	fifo_open
+
+TEST_METADATA.fifo_create+=	required_user="root"
+TEST_METADATA.fifo_open+=	required_user="root"
+
+.include <bsd.test.mk>

Copied: head/tests/sys/file/Makefile (from r281485, user/ngie/more-tests/tests/sys/file/Makefile)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/tests/sys/file/Makefile	Mon Apr 27 08:15:17 2015	(r282067, copy of r281485, user/ngie/more-tests/tests/sys/file/Makefile)
@@ -0,0 +1,25 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/sys/file
+
+BINDIR=		${TESTSDIR}
+
+TAP_TESTS_C+=	closefrom_test
+TAP_TESTS_C+=	dup_test
+TAP_TESTS_C+=	fcntlflags_test
+TAP_TESTS_SH+=	flock_test
+PLAIN_TESTS_C+=	ftruncate_test
+PLAIN_TESTS_C+=	newfileops_on_fork_test
+
+PROGS+=		flock_helper
+
+DPADD.closefrom_test=	${LIBUTIL}
+LDADD.closefrom_test=	-lutil
+
+DPADD.flock_helper=	${LIBPTHREAD}
+LDADD.flock_helper=	-lpthread
+
+DPADD.newfileops_on_fork_test=	${LIBPTHREAD}
+LDADD.newfileops_on_fork_test=	-lpthread
+
+.include <bsd.test.mk>

Modified: head/tests/sys/file/closefrom_test.c
==============================================================================
--- user/ngie/more-tests/tests/sys/file/closefrom_test.c	Sat Apr 11 10:14:59 2015	(r281432)
+++ head/tests/sys/file/closefrom_test.c	Mon Apr 27 08:15:17 2015	(r282067)
@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2009 Advanced Computing Technologies LLC
+ * Copyright (c) 2009 Hudson River Trading LLC
  * Written by: John H. Baldwin <jhb at FreeBSD.org>
  * All rights reserved.
  *


More information about the svn-src-all mailing list