svn commit: r290898 - in stable/10: etc/mtree usr.bin/limits usr.bin/limits/tests

[Garrett Cooper]

Author: ngie
Date: Mon Nov 16 00:58:31 2015
New Revision: 290898
URL: https://svnweb.freebsd.org/changeset/base/290898

Log:
  MFC r290567:
  
  Add some basic tests that exercise cputime limits with limits(1)
  
  Sponsored by: EMC / Isilon Storage Division

Added:
  stable/10/usr.bin/limits/tests/
     - copied from r290567, head/usr.bin/limits/tests/
Modified:
  stable/10/etc/mtree/BSD.tests.dist
  stable/10/usr.bin/limits/Makefile
  stable/10/usr.bin/limits/tests/Makefile
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/etc/mtree/BSD.tests.dist
==============================================================================
--- stable/10/etc/mtree/BSD.tests.dist	Mon Nov 16 00:52:31 2015	(r290897)
+++ stable/10/etc/mtree/BSD.tests.dist	Mon Nov 16 00:58:31 2015	(r290898)
@@ -374,6 +374,8 @@
         ..
         lastcomm
         ..
+        limits
+        ..
         m4
         ..
         ncal

Modified: stable/10/usr.bin/limits/Makefile
==============================================================================
--- stable/10/usr.bin/limits/Makefile	Mon Nov 16 00:52:31 2015	(r290897)
+++ stable/10/usr.bin/limits/Makefile	Mon Nov 16 00:58:31 2015	(r290898)
@@ -1,7 +1,13 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 PROG=	limits
 DPADD=	${LIBUTIL}
 LDADD=	-lutil
 
+.if ${MK_TESTS} != "no"
+SUBDIR+=	tests
+.endif
+
 .include <bsd.prog.mk>

Modified: stable/10/usr.bin/limits/tests/Makefile
==============================================================================
--- head/usr.bin/limits/tests/Makefile	Mon Nov  9 01:05:31 2015	(r290567)
+++ stable/10/usr.bin/limits/tests/Makefile	Mon Nov 16 00:58:31 2015	(r290898)
@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+TESTSDIR=	${TESTSBASE}/usr.bin/limits
+
 ATF_TESTS_SH+=	limits_test
 
 .include <bsd.test.mk>