Integrate contrib/netbsd-tests/bin/expr into the build/kyua as bin/expr/tests

MFC after: 1 week
Sponsored by: EMC / Isilon Storage Division

bin/expr/Makefile

@@ -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>

bin/expr/tests/Makefile

@@ -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>

etc/mtree/BSD.tests.dist

@@ -12,6 +12,8 @@
         ..
         date
         ..
+        expr
+        ..
         mv
         ..
         pax