From owner-svn-src-stable@FreeBSD.ORG  Mon Jan 26 11:49:07 2015
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 63BFBA33;
 Mon, 26 Jan 2015 11:49:07 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::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 4F2526CB;
 Mon, 26 Jan 2015 11:49:07 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0QBn7rW001194;
 Mon, 26 Jan 2015 11:49:07 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0QBn6sM001192;
 Mon, 26 Jan 2015 11:49:06 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201501261149.t0QBn6sM001192@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org
 using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Mon, 26 Jan 2015 11:49:06 +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: r277747 - in stable/10: bin/expr bin/expr/tests etc/mtree
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@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 26 Jan 2015 11:49:07 -0000

Author: ngie
Date: Mon Jan 26 11:49:06 2015
New Revision: 277747
URL: https://svnweb.freebsd.org/changeset/base/277747

Log:
  MFC r277358:
  
  r277358 (by ngie):
  
    Integrate contrib/netbsd-tests/bin/expr into the build/kyua as bin/expr/tests
  
    Sponsored by: EMC / Isilon Storage Division

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

Modified: stable/10/bin/expr/Makefile
==============================================================================
--- stable/10/bin/expr/Makefile	Mon Jan 26 11:37:16 2015	(r277746)
+++ stable/10/bin/expr/Makefile	Mon Jan 26 11:49:06 2015	(r277747)
@@ -1,9 +1,15 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 PROG=	expr
 SRCS=	expr.y
 YFLAGS=
 
 NO_WMISSING_VARIABLE_DECLARATIONS=
 
+.if ${MK_TESTS} != "no"
+SUBDIR+=	tests
+.endif
+
 .include <bsd.prog.mk>

Modified: stable/10/etc/mtree/BSD.tests.dist
==============================================================================
--- stable/10/etc/mtree/BSD.tests.dist	Mon Jan 26 11:37:16 2015	(r277746)
+++ stable/10/etc/mtree/BSD.tests.dist	Mon Jan 26 11:49:06 2015	(r277747)
@@ -10,6 +10,8 @@
         ..
         date
         ..
+        expr
+        ..
         mv
         ..
         pax