3 files changed, 37 insertions, 0 deletions

diff --git a/usr.bin/units/Makefile b/usr.bin/units/Makefile
index ebd1e0724f3a..3abbd3fdd507 100644
--- a/usr.bin/units/Makefile
+++ b/usr.bin/units/Makefile
@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+.include <src.opts.mk>
+
 PROG=	units
 FILES=	units.lib
 FILESDIR=	${SHAREDIR}/misc
@@ -7,4 +9,8 @@ FILESDIR=	${SHAREDIR}/misc
 LDADD+=-ledit -ltermcap
 DPADD+=${LIBEDIT} ${LIBTERMCAP}
 
+.if ${MK_TESTS} != "no"
+SUBDIR+= tests
+.endif
+
 .include <bsd.prog.mk>
diff --git a/usr.bin/units/tests/Makefile b/usr.bin/units/tests/Makefile
new file mode 100644
index 000000000000..887af6cc0fa8
--- /dev/null
+++ b/usr.bin/units/tests/Makefile
@@ -0,0 +1,9 @@
+# $FreeBSD$
+
+.include <bsd.own.mk>
+
+TESTSDIR=      ${TESTSBASE}/bin/chown
+
+TAP_TESTS_SH=	units_basics
+
+.include <bsd.test.mk>
diff --git a/usr.bin/units/tests/units_basics.sh b/usr.bin/units/tests/units_basics.sh
new file mode 100755
index 000000000000..adc28e031fa9
--- /dev/null
+++ b/usr.bin/units/tests/units_basics.sh
@@ -0,0 +1,22 @@
+#!/bin/sh
+# $FreeBSD$
+
+base=`basename $0`
+
+echo "1..3"
+
+assert_equals() {
+    testnum="$1"
+    expected="$2"
+    fn="$3"
+    if [ "$expected" = "$($fn)" ]
+    then
+        echo "ok $testnum - $fn"
+    else
+        echo "not ok $testnum - $fn"
+    fi
+}
+
+assert_equals 1 1 "units -t ft ft"
+assert_equals 2 12 "units -t ft in"
+assert_equals 3 0.083333333 "units -t in ft"