From owner-svn-src-head@FreeBSD.ORG  Thu Jul 17 07:12:13 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 70979951;
 Thu, 17 Jul 2014 07:12:13 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 455D22614;
 Thu, 17 Jul 2014 07:12:13 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6H7CD0w096988;
 Thu, 17 Jul 2014 07:12:13 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6H7CCdw096979;
 Thu, 17 Jul 2014 07:12:12 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201407170712.s6H7CCdw096979@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Thu, 17 Jul 2014 07:12:12 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r268794 - in head: etc/mtree usr.bin/units
 usr.bin/units/tests
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 17 Jul 2014 07:12:13 -0000

Author: eadler
Date: Thu Jul 17 07:12:12 2014
New Revision: 268794
URL: http://svnweb.freebsd.org/changeset/base/268794

Log:
  units(1): Add basic tests
  	Add some tests to help avoid breaking units

Added:
  head/usr.bin/units/tests/
  head/usr.bin/units/tests/Makefile   (contents, props changed)
  head/usr.bin/units/tests/units_basics.sh   (contents, props changed)
Modified:
  head/etc/mtree/BSD.tests.dist
  head/usr.bin/units/Makefile

Modified: head/etc/mtree/BSD.tests.dist
==============================================================================
--- head/etc/mtree/BSD.tests.dist	Thu Jul 17 06:57:26 2014	(r268793)
+++ head/etc/mtree/BSD.tests.dist	Thu Jul 17 07:12:12 2014	(r268794)
@@ -256,6 +256,8 @@
             tr
             ..
             truncate
+	    ..
+	    units
             ..
             uudecode
             ..

Modified: head/usr.bin/units/Makefile
==============================================================================
--- head/usr.bin/units/Makefile	Thu Jul 17 06:57:26 2014	(r268793)
+++ head/usr.bin/units/Makefile	Thu Jul 17 07:12:12 2014	(r268794)
@@ -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>

Added: head/usr.bin/units/tests/Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/usr.bin/units/tests/Makefile	Thu Jul 17 07:12:12 2014	(r268794)
@@ -0,0 +1,9 @@
+# $FreeBSD$
+
+.include <bsd.own.mk>
+
+TESTSDIR=      ${TESTSBASE}/bin/chown
+
+TAP_TESTS_SH=	units_basics
+
+.include <bsd.test.mk>

Added: head/usr.bin/units/tests/units_basics.sh
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/usr.bin/units/tests/units_basics.sh	Thu Jul 17 07:12:12 2014	(r268794)
@@ -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"