16 files changed, 71 insertions, 0 deletions

diff --git a/usr.bin/printf/Makefile b/usr.bin/printf/Makefile
index c91c4e3f53c1..31047c53f931 100644
--- a/usr.bin/printf/Makefile
+++ b/usr.bin/printf/Makefile
@@ -1,6 +1,12 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 PROG=	printf
 
+.if ${MK_TESTS} != "no"
+SUBDIR+= tests
+.endif
+
 .include <bsd.prog.mk>
diff --git a/usr.bin/printf/tests/Makefile b/usr.bin/printf/tests/Makefile
new file mode 100644
index 000000000000..da3f53309c82
--- /dev/null
+++ b/usr.bin/printf/tests/Makefile
@@ -0,0 +1,22 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/printf
+
+TAP_TESTS_SH=	legacy_test
+
+FILESDIR=	${TESTSDIR}
+FILES=		regress.b.out
+FILES+=		regress.d.out
+FILES+=		regress.f.out
+FILES+=		regress.l1.out
+FILES+=		regress.l2.out
+FILES+=		regress.m1.out
+FILES+=		regress.m2.out
+FILES+=		regress.m3.out
+FILES+=		regress.m4.out
+FILES+=		regress.m5.out
+FILES+=		regress.s.out
+FILES+=		regress.sh
+FILES+=		regress.zero.out
+
+.include <bsd.test.mk>
diff --git a/usr.bin/printf/tests/legacy_test.sh b/usr.bin/printf/tests/legacy_test.sh
new file mode 100644
index 000000000000..1b6b806c5980
--- /dev/null
+++ b/usr.bin/printf/tests/legacy_test.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+# $FreeBSD$
+
+SRCDIR="$(dirname "${0}")"; export SRCDIR
+
+m4 "${SRCDIR}/../regress.m4" "${SRCDIR}/regress.sh" | sh
diff --git a/usr.bin/printf/tests/regress.b.out b/usr.bin/printf/tests/regress.b.out
new file mode 100644
index 000000000000..0373d9336f8c
--- /dev/null
+++ b/usr.bin/printf/tests/regress.b.out
@@ -0,0 +1 @@
+abcdef
diff --git a/usr.bin/printf/tests/regress.d.out b/usr.bin/printf/tests/regress.d.out
new file mode 100644
index 000000000000..da83c085263c
--- /dev/null
+++ b/usr.bin/printf/tests/regress.d.out
@@ -0,0 +1 @@
+123,  123,00123,00123,00123
diff --git a/usr.bin/printf/tests/regress.f.out b/usr.bin/printf/tests/regress.f.out
new file mode 100644
index 000000000000..127cb8aebe25
--- /dev/null
+++ b/usr.bin/printf/tests/regress.f.out
@@ -0,0 +1 @@
+42.250000,-42.250 ,inf,nan
diff --git a/usr.bin/printf/tests/regress.l1.out b/usr.bin/printf/tests/regress.l1.out
new file mode 100644
index 000000000000..9be0dc9a9e6f
--- /dev/null
+++ b/usr.bin/printf/tests/regress.l1.out
@@ -0,0 +1 @@
+228
diff --git a/usr.bin/printf/tests/regress.l2.out b/usr.bin/printf/tests/regress.l2.out
new file mode 100644
index 000000000000..9be0dc9a9e6f
--- /dev/null
+++ b/usr.bin/printf/tests/regress.l2.out
@@ -0,0 +1 @@
+228
diff --git a/usr.bin/printf/tests/regress.m1.out b/usr.bin/printf/tests/regress.m1.out
new file mode 100644
index 000000000000..a9e063ee9709
--- /dev/null
+++ b/usr.bin/printf/tests/regress.m1.out
diff --git a/usr.bin/printf/tests/regress.m2.out b/usr.bin/printf/tests/regress.m2.out
new file mode 100644
index 000000000000..8baef1b4abc4
--- /dev/null
+++ b/usr.bin/printf/tests/regress.m2.out
@@ -0,0 +1 @@
+abc
diff --git a/usr.bin/printf/tests/regress.m3.out b/usr.bin/printf/tests/regress.m3.out
new file mode 100644
index 000000000000..bbe4e70c33f4
--- /dev/null
+++ b/usr.bin/printf/tests/regress.m3.out
@@ -0,0 +1,4 @@
+%abc
+%def
+%ghi
+%jkl
diff --git a/usr.bin/printf/tests/regress.m4.out b/usr.bin/printf/tests/regress.m4.out
new file mode 100644
index 000000000000..5e0b5d4072a4
--- /dev/null
+++ b/usr.bin/printf/tests/regress.m4.out
@@ -0,0 +1 @@
+0,0.000000,,
diff --git a/usr.bin/printf/tests/regress.m5.out b/usr.bin/printf/tests/regress.m5.out
new file mode 100644
index 000000000000..2838468eb842
--- /dev/null
+++ b/usr.bin/printf/tests/regress.m5.out
@@ -0,0 +1 @@
+-d
diff --git a/usr.bin/printf/tests/regress.s.out b/usr.bin/printf/tests/regress.s.out
new file mode 100644
index 000000000000..3d572b93c8f7
--- /dev/null
+++ b/usr.bin/printf/tests/regress.s.out
@@ -0,0 +1 @@
+abc,abc  
diff --git a/usr.bin/printf/tests/regress.sh b/usr.bin/printf/tests/regress.sh
new file mode 100644
index 000000000000..84e183b99397
--- /dev/null
+++ b/usr.bin/printf/tests/regress.sh
@@ -0,0 +1,23 @@
+# $FreeBSD$
+
+REGRESSION_START($1)
+
+echo '1..15'
+
+REGRESSION_TEST(`b', `printf "abc%b%b" "def\n" "\cghi"')
+REGRESSION_TEST(`d', `printf "%d,%5d,%.5d,%0*d,%.*d\n" 123 123 123 5 123 5 123')
+REGRESSION_TEST(`f', `printf "%f,%-8.3f,%f,%f\n" +42.25 -42.25 inf nan')
+REGRESSION_TEST(`l1', `LC_ALL=en_US.ISO8859-1 printf "%d\n" $(printf \"\\344)')
+REGRESSION_TEST(`l2', `LC_ALL=en_US.UTF-8 printf "%d\n" $(printf \"\\303\\244)')
+REGRESSION_TEST(`m1', `printf "%c%%%d\0\045\n" abc \"abc')
+REGRESSION_TEST(`m2', `printf "abc\n\cdef"')
+REGRESSION_TEST(`m3', `printf "%%%s\n" abc def ghi jkl')
+REGRESSION_TEST(`m4', `printf "%d,%f,%c,%s\n"')
+REGRESSION_TEST(`m5', `printf -- "-d\n"')
+REGRESSION_TEST(`s', `printf "%.3s,%-5s\n" abcd abc')
+REGRESSION_TEST('zero', `printf "%u%u\n" 15')
+REGRESSION_TEST('zero', `printf "%d%d\n" 15')
+REGRESSION_TEST('zero', `printf "%d%u\n" 15')
+REGRESSION_TEST('zero', `printf "%u%d\n" 15')
+
+REGRESSION_END()
diff --git a/usr.bin/printf/tests/regress.zero.out b/usr.bin/printf/tests/regress.zero.out
new file mode 100644
index 000000000000..fa8f08cb6ff8
--- /dev/null
+++ b/usr.bin/printf/tests/regress.zero.out
@@ -0,0 +1 @@
+150