svn commit: r277358 - in head: bin/expr bin/expr/tests etc/mtree

[Garrett Cooper]

Author: ngie
Date: Mon Jan 19 06:13:07 2015
New Revision: 277358
URL: https://svnweb.freebsd.org/changeset/base/277358

Log:
  Integrate contrib/netbsd-tests/bin/expr into the build/kyua as bin/expr/tests
  
  MFC after: 1 week
  Sponsored by: EMC / Isilon Storage Division

Added:
  head/bin/expr/tests/
  head/bin/expr/tests/Makefile   (contents, props changed)
Modified:
  head/bin/expr/Makefile
  head/etc/mtree/BSD.tests.dist

Modified: head/bin/expr/Makefile
==============================================================================
--- head/bin/expr/Makefile	Mon Jan 19 06:10:01 2015	(r277357)
+++ head/bin/expr/Makefile	Mon Jan 19 06:13:07 2015	(r277358)
@@ -1,9 +1,15 @@
 # $FreeBSD$
 
+.include <src.opts.mk>
+
 PROG=	expr
 SRCS=	expr.y
 YFLAGS=
 
 NO_WMISSING_VARIABLE_DECLARATIONS=
 
+.if ${MK_TESTS} != "no"
+SUBDIR+=	tests
+.endif
+
 .include <bsd.prog.mk>

Added: head/bin/expr/tests/Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/bin/expr/tests/Makefile	Mon Jan 19 06:13:07 2015	(r277358)
@@ -0,0 +1,16 @@
+# $FreeBSD$
+
+OBJTOP=		${.OBJDIR}/../../..
+SRCTOP=		${.CURDIR}/../../..
+TESTSRC=	${SRCTOP}/contrib/netbsd-tests/bin/expr
+
+TESTSDIR=	${TESTSBASE}/bin/expr
+
+NETBSD_ATF_TESTS_SH=	expr_test
+
+ATF_TESTS_SH_SED_expr_test+=	-e 's/eval expr/eval expr --/g'
+ATF_TESTS_SH_SED_expr_test+=	-e 's/"expr: integer overflow or underflow occurred for operation.*"/"expr: overflow"/g'
+
+.include <netbsd-tests.test.mk>
+
+.include <bsd.test.mk>

Modified: head/etc/mtree/BSD.tests.dist
==============================================================================
--- head/etc/mtree/BSD.tests.dist	Mon Jan 19 06:10:01 2015	(r277357)
+++ head/etc/mtree/BSD.tests.dist	Mon Jan 19 06:13:07 2015	(r277358)
@@ -12,6 +12,8 @@
         ..
         date
         ..
+        expr
+        ..
         mv
         ..
         pax