Index: contrib/one-true-awk/bugs-fixed/missing-precision.err
===================================================================
--- /dev/null
+++ contrib/one-true-awk/bugs-fixed/missing-precision.err
@@ -0,0 +1,2 @@
+awk: not enough args in printf(%*s)
+ source line number 1
Index: contrib/one-true-awk/bugs-fixed/missing-precision.ok
===================================================================
--- contrib/one-true-awk/bugs-fixed/missing-precision.ok
+++ /dev/null
@@ -1,2 +0,0 @@
-../a.out: not enough args in printf(%*s)
- source line number 1
Index: contrib/one-true-awk/bugs-fixed/negative-nf.err
===================================================================
--- /dev/null
+++ contrib/one-true-awk/bugs-fixed/negative-nf.err
@@ -0,0 +1,2 @@
+awk: cannot set NF to a negative value
+ source line number 1
Index: contrib/one-true-awk/bugs-fixed/negative-nf.ok
===================================================================
--- contrib/one-true-awk/bugs-fixed/negative-nf.ok
+++ /dev/null
@@ -1,2 +0,0 @@
-../a.out: cannot set NF to a negative value
- source line number 1
Index: contrib/one-true-awk/bugs-fixed/pfile-overflow.ok
===================================================================
--- contrib/one-true-awk/bugs-fixed/pfile-overflow.ok
+++ /dev/null
@@ -1,4 +0,0 @@
-../a.out: syntax error at source line 1 source file pfile-overflow.awk
- context is
-	 >>>  <<< 
-../a.out: bailing out at source line 1 source file pfile-overflow.awk
Index: etc/mtree/BSD.tests.dist
===================================================================
--- etc/mtree/BSD.tests.dist
+++ etc/mtree/BSD.tests.dist
@@ -871,6 +871,10 @@
         apply
         ..
         awk
+	    bugs-fixed
+	    ..
+	    netbsd
+	    ..
         ..
         basename
         ..
Index: usr.bin/awk/tests/bugs-fixed/Makefile
===================================================================
--- /dev/null
+++ usr.bin/awk/tests/bugs-fixed/Makefile
@@ -0,0 +1,14 @@
+# $FreeBSD$
+
+PACKAGE=	tests
+
+TESTSDIR=	${TESTSBASE}/usr.bin/awk/${.CURDIR:T}
+TESTSRC=	${SRCTOP}/contrib/one-true-awk/bugs-fixed
+
+ATF_TESTS_SH=	bug_fix_test
+
+.PATH:		${TESTSRC}
+# Upstream controls the list of tests, so generate it dynamically
+${PACKAGE}FILES!=(cd ${TESTSRC} ; ls *.awk *.ok *.in *.err)
+
+.include <bsd.test.mk>
Index: usr.bin/awk/tests/bugs-fixed/bug_fix_test.sh
===================================================================
--- /dev/null
+++ usr.bin/awk/tests/bugs-fixed/bug_fix_test.sh
@@ -0,0 +1,75 @@
+#
+# Copyright 2014 EMC Corp.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+# * Redistributions of source code must retain the above copyright
+#   notice, this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above copyright
+#   notice, this list of conditions and the following disclaimer in the
+#   documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+# $FreeBSD$
+
+SRCDIR=$(atf_get_srcdir)
+
+check()
+{
+	local tc=${1%.awk}; shift
+	local in_flag out_flag err_flag
+
+	awk=awk
+
+	local out_file="${SRCDIR}/${tc}.ok"
+	[ -f "${out_file}" ] && out_flag="-o file:${out_file}"
+	local err_file="${SRCDIR}/${tc}.err"
+	[ -f "${err_file}" ] && err_flag="-e file:${err_file} -s exit:2"
+	local in_file="${SRCDIR}/${tc}.in"
+	[ -f "${in_file}" ] && in_flag="${in_file}"
+
+	(cd ${SRCDIR} ; atf_check ${out_flag} ${err_flag} ${awk} -f "${tc}.awk" ${in_flag})
+}
+
+add_testcase()
+{
+	local tc=${1%.awk}
+	local tc_escaped word
+
+	case "${tc%.*}" in
+	*-*)
+		local IFS="-"
+		for word in ${tc}; do
+			tc_escaped="${tc_escaped:+${tc_escaped}_}${word}"
+		done
+		;;
+	*)
+		tc_escaped=${tc}
+		;;
+	esac
+
+	atf_test_case ${tc_escaped}
+	eval "${tc_escaped}_body() { check ${tc}; }"
+	atf_add_test_case ${tc_escaped}
+}
+
+atf_init_test_cases()
+{
+	for path in $(find -s "${SRCDIR}" -name '*.awk'); do
+		add_testcase ${path##*/}
+	done
+}
Index: usr.bin/awk/tests/netbsd/Makefile
===================================================================
--- usr.bin/awk/tests/netbsd/Makefile
+++ usr.bin/awk/tests/netbsd/Makefile
@@ -2,6 +2,9 @@
 
 PACKAGE=	tests
 
+TESTSDIR=	${TESTSBASE}/usr.bin/awk/${.CURDIR:T}
+TESTSRC=	${SRCTOP}/contrib/netbsd-tests/usr.bin/awk
+
 NETBSD_ATF_TESTS_SH=	awk_test
 
 ${PACKAGE}FILES+=	d_assign_NF.awk