From owner-svn-src-stable-10@freebsd.org  Mon Nov 16 00:58:33 2015
Return-Path: <owner-svn-src-stable-10@freebsd.org>
Delivered-To: svn-src-stable-10@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 41BCEA30F2F;
 Mon, 16 Nov 2015 00:58:33 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 0BE0E1AD2;
 Mon, 16 Nov 2015 00:58:32 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tAG0wWTj071896;
 Mon, 16 Nov 2015 00:58:32 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAG0wV70071893;
 Mon, 16 Nov 2015 00:58:31 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201511160058.tAG0wV70071893@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
 ngie@FreeBSD.org using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Mon, 16 Nov 2015 00:58:31 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r290898 - in stable/10: etc/mtree usr.bin/limits
 usr.bin/limits/tests
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-10@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for only the 10-stable src tree
 <svn-src-stable-10.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-10/>
List-Post: <mailto:svn-src-stable-10@freebsd.org>
List-Help: <mailto:svn-src-stable-10-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 16 Nov 2015 00:58:33 -0000

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>