From 36ace8a0d3ea03158960c8b8288fb69f08b1ad19 Mon Sep 17 00:00:00 2001
From: Enji Cooper <ngie@FreeBSD.org>
Date: Sun, 18 Oct 2015 05:49:58 +0000
Subject: [PATCH] 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
---
 bin/dd/Makefile                     | 6 ++++++
 bin/dd/tests/Makefile               | 7 +++++++
 contrib/netbsd-tests/bin/dd/t_dd.sh | 6 ++++++
 etc/mtree/BSD.tests.dist            | 2 ++
 4 files changed, 21 insertions(+)
 create mode 100644 bin/dd/tests/Makefile

diff --git a/bin/dd/Makefile b/bin/dd/Makefile
index eb8ec8527b17..5f07dbc248ac 100644
--- a/bin/dd/Makefile
+++ b/bin/dd/Makefile
@@ -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>
diff --git a/bin/dd/tests/Makefile b/bin/dd/tests/Makefile
new file mode 100644
index 000000000000..dd04af915887
--- /dev/null
+++ b/bin/dd/tests/Makefile
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+NETBSD_ATF_TESTS_SH=	dd_test
+
+.include <netbsd-tests.test.mk>
+
+.include <bsd.test.mk>
diff --git a/contrib/netbsd-tests/bin/dd/t_dd.sh b/contrib/netbsd-tests/bin/dd/t_dd.sh
index d713ad9cb246..62379c241484 100755
--- a/contrib/netbsd-tests/bin/dd/t_dd.sh
+++ b/contrib/netbsd-tests/bin/dd/t_dd.sh
@@ -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 \
diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist
index c31eaaa97e33..8d293230f269 100644
--- a/etc/mtree/BSD.tests.dist
+++ b/etc/mtree/BSD.tests.dist
@@ -12,6 +12,8 @@
         ..
         date
         ..
+        dd
+        ..
         expr
         ..
         ls