From owner-svn-src-head@FreeBSD.ORG  Mon Jan 19 06:13:09 2015
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@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 48C4B528;
 Mon, 19 Jan 2015 06:13:09 +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 1AC9794C;
 Mon, 19 Jan 2015 06:13:09 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0J6D8bC016606;
 Mon, 19 Jan 2015 06:13:08 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0J6D87R016603;
 Mon, 19 Jan 2015 06:13:08 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201501190613.t0J6D87R016603@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, 19 Jan 2015 06:13:08 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r277358 - in head: bin/expr bin/expr/tests etc/mtree
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 19 Jan 2015 06:13:09 -0000

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