From owner-svn-src-all@freebsd.org Sun Oct 18 05:50:00 2015 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 614D4A186B6; Sun, 18 Oct 2015 05:50:00 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 13506147F; Sun, 18 Oct 2015 05:50:00 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9I5nxXL038082; Sun, 18 Oct 2015 05:49:59 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9I5nw5r038077; Sun, 18 Oct 2015 05:49:58 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201510180549.t9I5nw5r038077@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Sun, 18 Oct 2015 05:49:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r289487 - in head: bin/dd bin/dd/tests contrib/netbsd-tests/bin/dd 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-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 Oct 2015 05:50:00 -0000 Author: ngie Date: Sun Oct 18 05:49:58 2015 New Revision: 289487 URL: https://svnweb.freebsd.org/changeset/base/289487 Log: Integrate contrib/netbsd-tests/bin/dd into the FreeBSD test suite as bin/dd/tests Ensure fdescfs is mounted on /dev/fd/ for the length testcase as it's used in validating the characters read from /dev/zero MFC after: 2 weeks Sponsored by: EMC / Isilon Storage Division Added: head/bin/dd/tests/ - copied from r289485, user/ngie/more-tests2/bin/dd/tests/ Modified: head/bin/dd/Makefile head/bin/dd/tests/Makefile head/contrib/netbsd-tests/bin/dd/t_dd.sh head/etc/mtree/BSD.tests.dist Directory Properties: head/ (props changed) Modified: head/bin/dd/Makefile ============================================================================== --- head/bin/dd/Makefile Sun Oct 18 05:36:05 2015 (r289486) +++ head/bin/dd/Makefile Sun Oct 18 05:49:58 2015 (r289487) @@ -1,6 +1,8 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 # $FreeBSD$ +.include + PROG= dd SRCS= args.c conv.c conv_tab.c dd.c misc.c position.c @@ -24,4 +26,8 @@ test: ${PROG} gen .endfor @rm -f gen +.if ${MK_TESTS} != "no" +SUBDIR+= tests +.endif + .include Modified: head/bin/dd/tests/Makefile ============================================================================== --- user/ngie/more-tests2/bin/dd/tests/Makefile Sun Oct 18 05:29:49 2015 (r289485) +++ head/bin/dd/tests/Makefile Sun Oct 18 05:49:58 2015 (r289487) @@ -1,6 +1,6 @@ # $FreeBSD$ -NETBSD_ATF_TESTS_SH= dd +NETBSD_ATF_TESTS_SH= dd_test .include Modified: head/contrib/netbsd-tests/bin/dd/t_dd.sh ============================================================================== --- head/contrib/netbsd-tests/bin/dd/t_dd.sh Sun Oct 18 05:36:05 2015 (r289486) +++ head/contrib/netbsd-tests/bin/dd/t_dd.sh Sun Oct 18 05:49:58 2015 (r289487) @@ -44,6 +44,12 @@ length_head() { "the one expected to fail. (NetBSD PR bin/8521)" } length_body() { + # Begin FreeBSD + if ! df /dev/fd | grep -q '^fdescfs'; then + atf_skip "fdescfs is not mounted on /dev/fd" + fi + # End FreeBSD + test_dd_length 512 \ "dd if=/dev/zero of=/dev/fd/5 count=1 5>&1 >/dev/null 2>/dev/null" test_dd_length 512 \ Modified: head/etc/mtree/BSD.tests.dist ============================================================================== --- head/etc/mtree/BSD.tests.dist Sun Oct 18 05:36:05 2015 (r289486) +++ head/etc/mtree/BSD.tests.dist Sun Oct 18 05:49:58 2015 (r289487) @@ -12,6 +12,8 @@ .. date .. + dd + .. expr .. ls