From dbf17386daffa471de2b4e78349b38842eca6a13 Mon Sep 17 00:00:00 2001
From: ngie <ngie@FreeBSD.org>
Date: Sun, 18 Oct 2015 01:21:29 +0000
Subject: [PATCH 1/4] Port over diff from ^/user/ngie/more-tests to replace
 `make test` with `make regress`

---
 share/mk/bsd.README    |  8 ++++----
 share/mk/bsd.test.mk   | 15 +++++----------
 share/mk/suite.test.mk | 40 +++++++---------------------------------
 3 files changed, 16 insertions(+), 47 deletions(-)

diff --git a/share/mk/bsd.README b/share/mk/bsd.README
index cb6e41f3cf07..a12d0a81e4c6 100644
--- a/share/mk/bsd.README
+++ b/share/mk/bsd.README
@@ -463,14 +463,14 @@ It has seven targets:
                 install target is executed.
 	lint:
 		run lint on the source files.
-	tags:
-		create a tags file for the source files.
-	test:
+	regress:
 		runs the test programs from the object directory; if the
 		Makefile does not itself define the target test, the
-		targets beforetest and aftertest may also be used to
+		targets beforeregress and afterregress may also be used to
 		cause actions immediately before and after the test
 		target is executed.
+	tags:
+		create a tags file for the source files.
 
 It sets/uses the following variables, among many others:
 
diff --git a/share/mk/bsd.test.mk b/share/mk/bsd.test.mk
index 86351cff3c6c..69ada898cb3b 100644
--- a/share/mk/bsd.test.mk
+++ b/share/mk/bsd.test.mk
@@ -76,19 +76,14 @@ PROGS_TARGETS+= install
 .include <suite.test.mk>
 .endif
 
-.if !target(realtest)
-realtest: .PHONY
+.if !target(realregress)
+realregress: .PHONY
 	@echo "$@ not defined; skipping"
 .endif
 
-test: .PHONY
-.ORDER: beforetest realtest
-test: beforetest realtest
-
-.if target(aftertest)
-.ORDER: realtest aftertest
-test: aftertest
-.endif
+beforeregress realregress afterregress regress: .PHONY
+.ORDER: beforeregress realregress afterregress
+regress: beforeregress realregress afterregress
 
 .ifdef PROG
 # we came here via bsd.progs.mk below
diff --git a/share/mk/suite.test.mk b/share/mk/suite.test.mk
index c447a171bf52..0b244c8b7660 100644
--- a/share/mk/suite.test.mk
+++ b/share/mk/suite.test.mk
@@ -51,7 +51,7 @@ KYUAFILE?= auto
 
 # Path to the prefix of the installed Kyua CLI, if any.
 #
-# If kyua is installed from ports, we automatically define a realtest target
+# If kyua is installed from ports, we automatically define a realregress target
 # below to run the tests using this tool.  The tools are searched for in the
 # hierarchy specified by this variable.
 KYUA_PREFIX?= /usr/local
@@ -92,9 +92,13 @@ Kyuafile.auto: Makefile
 	@mv Kyuafile.auto.tmp Kyuafile.auto
 .endif
 
+_kyuafile=	${DESTDIR}${TESTSDIR}/Kyuafile
+
 KYUA?= ${KYUA_PREFIX}/bin/kyua
+
+realregress: .PHONY
 .if exists(${KYUA})
-# Definition of the "make test" target and supporting variables.
+# Definition of the "make regress" target and supporting variables.
 #
 # This target, by necessity, can only work for native builds (i.e. a FreeBSD
 # host building a release for the same system).  The target runs Kyua, which is
@@ -103,35 +107,5 @@ KYUA?= ${KYUA_PREFIX}/bin/kyua
 # Due to the dependencies of the binaries built by the source tree and how they
 # are used by tests, it is highly possible for a execution of "make test" to
 # report bogus results unless the new binaries are put in place.
-realtest: .PHONY
-	@echo "*** WARNING: make test is experimental"
-	@echo "***"
-	@echo "*** Using this test does not preclude you from running the tests"
-	@echo "*** installed in ${TESTSBASE}.  This test run may raise false"
-	@echo "*** positives and/or false negatives."
-	@echo
-	@${KYUA} test -k ${DESTDIR}${TESTSDIR}/Kyuafile; \
-	result=0; \
-	echo; \
-	echo "*** Once again, note that "make test" is unsupported."; \
-	test $${result} -eq 0
+	@${KYUA} test -k ${DESTDIR}${TESTSDIR}/Kyuafile
 .endif
-
-beforetest: .PHONY
-.if defined(TESTSDIR)
-.if ${TESTSDIR} == ${TESTSBASE}
-# Forbid running from ${TESTSBASE}.  It can cause false positives/negatives and
-# it does not cover all the tests (e.g. it misses testing software in external).
-	@echo "*** Sorry, you cannot use make test from src/tests.  Install the"
-	@echo "*** tests into their final location and run them from ${TESTSBASE}"
-	@false
-.else
-	@echo "*** Using this test does not preclude you from running the tests"
-	@echo "*** installed in ${TESTSBASE}.  This test run may raise false"
-	@echo "*** positives and/or false negatives."
-.endif
-.else
-	@echo "*** No TESTSDIR defined; nothing to do."
-	@false
-.endif
-	@echo

From bae0f45cc488c4da58e0d394200527044d69681a Mon Sep 17 00:00:00 2001
From: ngie <ngie@FreeBSD.org>
Date: Sun, 18 Oct 2015 04:50:53 +0000
Subject: [PATCH 2/4] MFhead @ r289481

---
 share/mk/bsd.sys.mk                     |   6 +-
 sys/arm/mv/std-pj4b.mv                  |   6 +-
 sys/contrib/ipfilter/netinet/ip_state.c |   3 +-
 sys/mips/atheros/if_arge.c              | 113 +++++++++++++++++++-----
 sys/mips/atheros/if_argevar.h           |  28 +++++-
 5 files changed, 129 insertions(+), 27 deletions(-)

diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk
index 68351a0d22a7..cad2b2f79645 100644
--- a/share/mk/bsd.sys.mk
+++ b/share/mk/bsd.sys.mk
@@ -150,11 +150,13 @@ CXXFLAGS.clang+=	 -Wno-c++11-extensions
     ${MACHINE_CPUARCH} != "arm" && ${MACHINE_CPUARCH} != "mips"
 .if (${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} >= 30500) || \
     (${COMPILER_TYPE} == "gcc" && \
-     (${COMPILER_VERSION} == 40201 || ${COMPILER_VERSION} >= 40800))
+     (${COMPILER_VERSION} == 40201 || ${COMPILER_VERSION} >= 40900))
 # Don't use -Wstack-protector as it breaks world with -Werror.
 SSP_CFLAGS?=	-fstack-protector-strong
-CFLAGS+=	${SSP_CFLAGS}
+.else
+SSP_CFLAGS?=	-fstack-protector
 .endif
+CFLAGS+=	${SSP_CFLAGS}
 .endif # SSP && !ARM && !MIPS
 
 # Allow user-specified additional warning flags, plus compiler specific flag overrides.
diff --git a/sys/arm/mv/std-pj4b.mv b/sys/arm/mv/std-pj4b.mv
index ed9fd00bab69..8a64fab7bc1e 100644
--- a/sys/arm/mv/std-pj4b.mv
+++ b/sys/arm/mv/std-pj4b.mv
@@ -5,4 +5,8 @@ cpu		CPU_MV_PJ4B
 machine 	arm	armv6
 makeoptions	CONF_CFLAGS="-march=armv7a"
 
-options		VM_MAXUSER_ADDRESS="(KERNBASE-(1024*1024*1024))"
+# This was originally defined as "(KERNBASE-(1024*1024*1024))" but that
+# (in opt_global.h) clashed with the value emitted by genassym which
+# reduces the original macro text to its numeric value.  The only way
+# to avoid that is to define it here as the numeric value genassym emits.
+options		VM_MAXUSER_ADDRESS="0x80000000"
diff --git a/sys/contrib/ipfilter/netinet/ip_state.c b/sys/contrib/ipfilter/netinet/ip_state.c
index a3930ea69fc4..2ceec3262ec9 100644
--- a/sys/contrib/ipfilter/netinet/ip_state.c
+++ b/sys/contrib/ipfilter/netinet/ip_state.c
@@ -3650,7 +3650,6 @@ ipf_state_del(softc, is, why)
 	if (is->is_ref > 0) {
 		int refs;
 
-		is->is_ref--;
 		refs = is->is_ref;
 		MUTEX_EXIT(&is->is_lock);
 		if (!orphan)
@@ -3667,7 +3666,7 @@ ipf_state_del(softc, is, why)
 		}
 	}
 
-	is->is_ref = 0;
+	ASSERT(is->is_ref == 0);
 	MUTEX_EXIT(&is->is_lock);
 
 	if (is->is_tqehead[0] != NULL) {
diff --git a/sys/mips/atheros/if_arge.c b/sys/mips/atheros/if_arge.c
index d0676f2ea432..446cd64d3282 100644
--- a/sys/mips/atheros/if_arge.c
+++ b/sys/mips/atheros/if_arge.c
@@ -298,6 +298,29 @@ arge_attach_sysctl(device_t dev)
 		"tx_pkts_unaligned", CTLFLAG_RW, &sc->stats.tx_pkts_unaligned,
 		0, "number of TX unaligned packets");
 
+	SYSCTL_ADD_UINT(ctx, SYSCTL_CHILDREN(tree), OID_AUTO,
+		"tx_pkts_unaligned_start", CTLFLAG_RW, &sc->stats.tx_pkts_unaligned_start,
+		0, "number of TX unaligned packets (start)");
+
+	SYSCTL_ADD_UINT(ctx, SYSCTL_CHILDREN(tree), OID_AUTO,
+		"tx_pkts_unaligned_len", CTLFLAG_RW, &sc->stats.tx_pkts_unaligned_len,
+		0, "number of TX unaligned packets (len)");
+
+	SYSCTL_ADD_UINT(ctx, SYSCTL_CHILDREN(tree), OID_AUTO,
+		"tx_pkts_nosegs", CTLFLAG_RW, &sc->stats.tx_pkts_nosegs,
+		0, "number of TX packets fail with no ring slots avail");
+
+	SYSCTL_ADD_UINT(ctx, SYSCTL_CHILDREN(tree), OID_AUTO,
+		"intr_stray_filter", CTLFLAG_RW, &sc->stats.intr_stray,
+		0, "number of stray interrupts (filter)");
+
+	SYSCTL_ADD_UINT(ctx, SYSCTL_CHILDREN(tree), OID_AUTO,
+		"intr_stray_intr", CTLFLAG_RW, &sc->stats.intr_stray2,
+		0, "number of stray interrupts (intr)");
+
+	SYSCTL_ADD_UINT(ctx, SYSCTL_CHILDREN(tree), OID_AUTO,
+		"intr_ok", CTLFLAG_RW, &sc->stats.intr_ok,
+		0, "number of OK interrupts");
 #ifdef	ARGE_DEBUG
 	SYSCTL_ADD_UINT(ctx, SYSCTL_CHILDREN(tree), OID_AUTO, "tx_prod",
 	    CTLFLAG_RW, &sc->arge_cdata.arge_tx_prod, 0, "");
@@ -626,6 +649,22 @@ arge_attach(device_t dev)
 		local_macstr = NULL;
 	}
 
+	/*
+	 * Hardware workarounds.
+	 */
+	switch (ar71xx_soc) {
+	case AR71XX_SOC_QCA9556:
+	case AR71XX_SOC_QCA9558:
+		/* Arbitrary alignment */
+		sc->arge_hw_flags |= ARGE_HW_FLG_TX_DESC_ALIGN_1BYTE;
+		sc->arge_hw_flags |= ARGE_HW_FLG_RX_DESC_ALIGN_1BYTE;
+		break;
+	default:
+		sc->arge_hw_flags |= ARGE_HW_FLG_TX_DESC_ALIGN_4BYTE;
+		sc->arge_hw_flags |= ARGE_HW_FLG_RX_DESC_ALIGN_4BYTE;
+		break;
+	}
+
 	/*
 	 * Some units (eg the TP-Link WR-1043ND) do not have a convenient
 	 * EEPROM location to read the ethernet MAC address from.
@@ -825,6 +864,9 @@ arge_attach(device_t dev)
 	ARGE_WRITE(sc, AR71XX_MAC_FIFO_CFG0,
 	    FIFO_CFG0_ALL << FIFO_CFG0_ENABLE_SHIFT);
 
+	/*
+	 * SoC specific bits.
+	 */
 	switch (ar71xx_soc) {
 		case AR71XX_SOC_AR7240:
 		case AR71XX_SOC_AR7241:
@@ -1351,24 +1393,35 @@ arge_init_locked(struct arge_softc *sc)
  * Return whether the mbuf chain is correctly aligned
  * for the arge TX engine.
  *
- * The TX engine requires each fragment to be aligned to a
- * 4 byte boundary and the size of each fragment except
- * the last to be a multiple of 4 bytes.
+ * All the MACs have a length requirement: any non-final
+ * fragment (ie, descriptor with MORE bit set) needs to have
+ * a length divisible by 4.
  *
- * XXX TODO: I believe this is only a bug on the AR71xx and
- * AR913x MACs. The later MACs (AR724x and later) does not
- * need this workaround.
+ * The AR71xx, AR913x require the start address also be
+ * DWORD aligned.  The later MACs don't.
  */
 static int
-arge_mbuf_chain_is_tx_aligned(struct mbuf *m0)
+arge_mbuf_chain_is_tx_aligned(struct arge_softc *sc, struct mbuf *m0)
 {
 	struct mbuf *m;
 
 	for (m = m0; m != NULL; m = m->m_next) {
-		if((mtod(m, intptr_t) & 3) != 0)
+		/*
+		 * Only do this for chips that require it.
+		 */
+		if ((sc->arge_hw_flags & ARGE_HW_FLG_TX_DESC_ALIGN_4BYTE) &&
+		    (mtod(m, intptr_t) & 3) != 0) {
+			sc->stats.tx_pkts_unaligned_start++;
 			return 0;
-		if ((m->m_next != NULL) && ((m->m_len & 0x03) != 0))
+		}
+
+		/*
+		 * All chips have this requirement for length.
+		 */
+		if ((m->m_next != NULL) && ((m->m_len & 0x03) != 0)) {
+			sc->stats.tx_pkts_unaligned_len++;
 			return 0;
+		}
 	}
 	return 1;
 }
@@ -1389,15 +1442,10 @@ arge_encap(struct arge_softc *sc, struct mbuf **m_head)
 	ARGE_LOCK_ASSERT(sc);
 
 	/*
-	 * Fix mbuf chain, all fragments should be 4 bytes aligned and
-	 * even 4 bytes
-	 *
-	 * XXX TODO: I believe this is only a bug on the AR71xx and
-	 * AR913x MACs. The later MACs (AR724x and later) does not
-	 * need this workaround.
+	 * Fix mbuf chain based on hardware alignment constraints.
 	 */
 	m = *m_head;
-	if (! arge_mbuf_chain_is_tx_aligned(m)) {
+	if (! arge_mbuf_chain_is_tx_aligned(sc, m)) {
 		sc->stats.tx_pkts_unaligned++;
 		m = m_defrag(*m_head, M_NOWAIT);
 		if (m == NULL) {
@@ -1427,6 +1475,7 @@ arge_encap(struct arge_softc *sc, struct mbuf **m_head)
 	/* Check number of available descriptors. */
 	if (sc->arge_cdata.arge_tx_cnt + nsegs >= (ARGE_TX_RING_COUNT - 1)) {
 		bus_dmamap_unload(sc->arge_cdata.arge_tx_tag, txd->tx_dmamap);
+		sc->stats.tx_pkts_nosegs++;
 		return (ENOBUFS);
 	}
 
@@ -1444,7 +1493,9 @@ arge_encap(struct arge_softc *sc, struct mbuf **m_head)
 		desc = &sc->arge_rdata.arge_tx_ring[prod];
 		desc->packet_ctrl = ARGE_DMASIZE(txsegs[i].ds_len);
 
-		if (txsegs[i].ds_addr & 3)
+		/* XXX Note: only relevant for older MACs; but check length! */
+		if ((sc->arge_hw_flags & ARGE_HW_FLG_TX_DESC_ALIGN_4BYTE) &&
+		    (txsegs[i].ds_addr & 3))
 			panic("TX packet address unaligned\n");
 
 		desc->packet_addr = txsegs[i].ds_addr;
@@ -1715,6 +1766,16 @@ arge_dma_alloc(struct arge_softc *sc)
 	struct arge_txdesc	*txd;
 	struct arge_rxdesc	*rxd;
 	int			error, i;
+	int			arge_tx_align, arge_rx_align;
+
+	/* Assume 4 byte alignment by default */
+	arge_tx_align = 4;
+	arge_rx_align = 4;
+
+	if (sc->arge_hw_flags & ARGE_HW_FLG_TX_DESC_ALIGN_1BYTE)
+		arge_tx_align = 1;
+	if (sc->arge_hw_flags & ARGE_HW_FLG_RX_DESC_ALIGN_1BYTE)
+		arge_rx_align = 1;
 
 	/* Create parent DMA tag. */
 	error = bus_dma_tag_create(
@@ -1775,7 +1836,7 @@ arge_dma_alloc(struct arge_softc *sc)
 	/* Create tag for Tx buffers. */
 	error = bus_dma_tag_create(
 	    sc->arge_cdata.arge_parent_tag,	/* parent */
-	    sizeof(uint32_t), 0,	/* alignment, boundary */
+	    arge_tx_align, 0,		/* alignment, boundary */
 	    BUS_SPACE_MAXADDR,		/* lowaddr */
 	    BUS_SPACE_MAXADDR,		/* highaddr */
 	    NULL, NULL,			/* filter, filterarg */
@@ -1793,7 +1854,7 @@ arge_dma_alloc(struct arge_softc *sc)
 	/* Create tag for Rx buffers. */
 	error = bus_dma_tag_create(
 	    sc->arge_cdata.arge_parent_tag,	/* parent */
-	    ARGE_RX_ALIGN, 0,		/* alignment, boundary */
+	    arge_rx_align, 0,		/* alignment, boundary */
 	    BUS_SPACE_MAXADDR,		/* lowaddr */
 	    BUS_SPACE_MAXADDR,		/* highaddr */
 	    NULL, NULL,			/* filter, filterarg */
@@ -2108,6 +2169,11 @@ arge_newbuf(struct arge_softc *sc, int idx)
 	if (m == NULL)
 		return (ENOBUFS);
 	m->m_len = m->m_pkthdr.len = MCLBYTES;
+
+	/*
+	 * Add extra space to "adjust" (copy) the packet back to be aligned
+	 * for purposes of IPv4/IPv6 header contents.
+	 */
 	m_adj(m, sizeof(uint64_t));
 
 	if (bus_dmamap_load_mbuf_sg(sc->arge_cdata.arge_rx_tag,
@@ -2126,7 +2192,8 @@ arge_newbuf(struct arge_softc *sc, int idx)
 	sc->arge_cdata.arge_rx_sparemap = map;
 	rxd->rx_m = m;
 	desc = rxd->desc;
-	if (segs[0].ds_addr & 3)
+	if ((sc->arge_hw_flags & ARGE_HW_FLG_RX_DESC_ALIGN_4BYTE) &&
+	    segs[0].ds_addr & 3)
 		panic("RX packet address unaligned");
 	desc->packet_addr = segs[0].ds_addr;
 	desc->packet_ctrl = ARGE_DESC_EMPTY | ARGE_DMASIZE(segs[0].ds_len);
@@ -2331,10 +2398,12 @@ arge_intr_filter(void *arg)
 	if (status & DMA_INTR_ALL) {
 		sc->arge_intr_status |= status;
 		ARGE_WRITE(sc, AR71XX_DMA_INTR, 0);
+		sc->stats.intr_ok++;
 		return (FILTER_SCHEDULE_THREAD);
 	}
 
 	sc->arge_intr_status = 0;
+	sc->stats.intr_stray++;
 	return (FILTER_STRAY);
 }
 
@@ -2355,8 +2424,10 @@ arge_intr(void *arg)
 	/*
 	 * Is it our interrupt at all?
 	 */
-	if (status == 0)
+	if (status == 0) {
+		sc->stats.intr_stray2++;
 		return;
+	}
 
 	if (status & DMA_INTR_RX_BUS_ERROR) {
 		ARGE_WRITE(sc, AR71XX_DMA_RX_STATUS, DMA_RX_STATUS_BUS_ERROR);
diff --git a/sys/mips/atheros/if_argevar.h b/sys/mips/atheros/if_argevar.h
index 048c375ae7bf..ae94588b97d6 100644
--- a/sys/mips/atheros/if_argevar.h
+++ b/sys/mips/atheros/if_argevar.h
@@ -37,7 +37,10 @@
 #define	ARGE_TX_DMA_SIZE	ARGE_TX_RING_COUNT * sizeof(struct arge_desc)
 #define	ARGE_MAXFRAGS		8
 #define ARGE_RING_ALIGN		sizeof(struct arge_desc)
-#define ARGE_RX_ALIGN		sizeof(uint32_t)
+#define ARGE_RX_ALIGN_4BYTE	sizeof(uint32_t)
+#define ARGE_RX_ALIGN_1BYTE	sizeof(char)
+#define ARGE_TX_ALIGN_4BYTE	sizeof(uint32_t)
+#define ARGE_TX_ALIGN_1BYTE	sizeof(char)
 #define ARGE_MAXFRAGS		8
 #define	ARGE_TX_RING_ADDR(sc, i)	\
     ((sc)->arge_rdata.arge_tx_ring_paddr + sizeof(struct arge_desc) * (i))
@@ -149,6 +152,22 @@ struct arge_pll_data {
 	uint32_t pll_1000;
 };
 
+/*
+ * Hardware specific behaviours.
+ */
+
+/*
+ * Older chips support 4 byte only transmit and receive
+ * addresses.
+ *
+ * Later chips support arbitrary TX and later later,
+ * arbitrary RX addresses.
+ */
+#define	ARGE_HW_FLG_TX_DESC_ALIGN_4BYTE	0x00000001
+#define	ARGE_HW_FLG_RX_DESC_ALIGN_4BYTE	0x00000002
+#define	ARGE_HW_FLG_TX_DESC_ALIGN_1BYTE	0x00000004
+#define	ARGE_HW_FLG_RX_DESC_ALIGN_1BYTE	0x00000008
+
 struct arge_softc {
 	struct ifnet		*arge_ifp;	/* interface info */
 	device_t		arge_dev;
@@ -180,13 +199,20 @@ struct arge_softc {
 	uint32_t		arge_intr_status;
 	int			arge_mac_unit;
 	int			arge_if_flags;
+	uint32_t		arge_hw_flags;
 	uint32_t		arge_debug;
 	uint32_t		arge_mdiofreq;
 	struct {
 		uint32_t	tx_pkts_unaligned;
+		uint32_t	tx_pkts_unaligned_start;
+		uint32_t	tx_pkts_unaligned_len;
+		uint32_t	tx_pkts_nosegs;
 		uint32_t	tx_pkts_aligned;
 		uint32_t	rx_overflow;
 		uint32_t	tx_underflow;
+		uint32_t	intr_stray;
+		uint32_t	intr_stray2;
+		uint32_t	intr_ok;
 	} stats;
 };
 

From 5df1a219f1a344ce0427fc63a47867b2ba37721f Mon Sep 17 00:00:00 2001
From: ngie <ngie@FreeBSD.org>
Date: Sun, 18 Oct 2015 05:25:51 +0000
Subject: [PATCH 3/4] Ensure fdescfs is mounted on /dev/fd/ in the length
 testcase

---
 contrib/netbsd-tests/bin/dd/t_dd.sh | 6 ++++++
 1 file changed, 6 insertions(+)

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 \

From e84cdeae2f06fd326af8175317ce7ef9a9ff562d Mon Sep 17 00:00:00 2001
From: ngie <ngie@FreeBSD.org>
Date: Sun, 18 Oct 2015 05:29:49 +0000
Subject: [PATCH 4/4] Integrate contrib/netbsd-tests/bin/dd into the FreeBSD
 test suite as bin/dd/tests

---
 bin/dd/Makefile          | 6 ++++++
 bin/dd/tests/Makefile    | 7 +++++++
 etc/mtree/BSD.tests.dist | 2 ++
 3 files changed, 15 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..40fb114642cd
--- /dev/null
+++ b/bin/dd/tests/Makefile
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+NETBSD_ATF_TESTS_SH=	dd
+
+.include <netbsd-tests.test.mk>
+
+.include <bsd.test.mk>
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