Date: Sun, 18 Oct 2015 05:49:58 +0000 (UTC) From: Garrett Cooper <ngie@FreeBSD.org> 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 Message-ID: <201510180549.t9I5nw5r038077@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 <src.opts.mk> + 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 <bsd.prog.mk> 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 <netbsd-tests.test.mk> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201510180549.t9I5nw5r038077>