svn commit: r277747 - in stable/10: bin/expr bin/expr/tests etc/mtree

[Garrett Cooper]

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