3 files changed, 118 insertions, 0 deletions
diff --git a/usr.bin/xo/Makefile b/usr.bin/xo/Makefile
index a287608aff3c..92692e550cf8 100644
--- a/usr.bin/xo/Makefile
+++ b/usr.bin/xo/Makefile
@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+.include <src.opts.mk>
+
 LIBXOSRC=	${SRCTOP}/contrib/libxo
 
 .PATH:	${LIBXOSRC}/xo
@@ -12,4 +14,8 @@ CFLAGS+=-I${LIBXOSRC}/libxo
 
 LIBADD=	xo util
 
+.if ${MK_TESTS} != "no"
+SUBDIR+=	tests
+.endif
+
 .include <bsd.prog.mk>
diff --git a/usr.bin/xo/tests/Makefile b/usr.bin/xo/tests/Makefile
new file mode 100644
index 000000000000..ea4916db0d64
--- /dev/null
+++ b/usr.bin/xo/tests/Makefile
@@ -0,0 +1,40 @@
+# $FreeBSD$
+
+.include <bsd.own.mk>
+
+LIBXOSRC=	${SRCTOP}/contrib/libxo
+
+.PATH: ${LIBXOSRC}/tests/xo ${LIBXOSRC}/tests/xo/saved
+
+.c.out .o.out:
+
+TESTSDIR=	${TESTSBASE}/usr.bin/xo
+
+BINDIR=		${TESTSDIR}
+
+ATF_TESTS_SH+=	functional_test
+
+FILES+=		xo_01.H.err
+FILES+=		xo_01.H.out
+FILES+=		xo_01.HIPx.err
+FILES+=		xo_01.HIPx.out
+FILES+=		xo_01.HP.err
+FILES+=		xo_01.HP.out
+FILES+=		xo_01.J.err
+FILES+=		xo_01.J.out
+FILES+=		xo_01.JP.err
+FILES+=		xo_01.JP.out
+FILES+=		xo_01.T.err
+FILES+=		xo_01.T.out
+FILES+=		xo_01.X.err
+FILES+=		xo_01.X.out
+FILES+=		xo_01.XP.err
+FILES+=		xo_01.XP.out
+
+SCRIPTS+=	xo_01
+
+LIBADD+=	xo
+
+.include <bsd.test.mk>
+
+.SUFFIXES: .sh
diff --git a/usr.bin/xo/tests/functional_test.sh b/usr.bin/xo/tests/functional_test.sh
new file mode 100755
index 000000000000..2a26faa4962e
--- /dev/null
+++ b/usr.bin/xo/tests/functional_test.sh
@@ -0,0 +1,72 @@
+#
+# Copyright 2015 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}; shift
+	local xo_fmt=${1}; shift
+
+	XO=$(atf_config_get usr.bin.xo.test_xo /usr/bin/xo)
+
+	local err_file="${SRCDIR}/${tc}${xo_fmt:+.${xo_fmt}}.err"
+	[ -s "${err_file}" ] && err_flag="-e file:${err_file}"
+	local out_file="${SRCDIR}/${tc}${xo_fmt:+.${xo_fmt}}.out"
+	[ -s "${out_file}" ] && out_flag="-o file:${out_file}"
+
+	atf_check -s exit:0 -e file:${err_file} -o file:${out_file} \
+	    env LC_ALL=en_US.UTF-8 \
+	        LIBXO_OPTIONS=":W${xo_fmt}" TZ="EST" "${SRCDIR}/${tc}" \
+		${XO}
+}
+
+add_testcase()
+{
+	local tc=${1}
+	local tc_escaped
+
+	oldIFS=$IFS
+	IFS='.'
+	set -- $tc
+	tc_script=${1}
+	[ $# -eq 3 ] && xo_fmt=${2} # Don't set xo_fmt to `out'
+	IFS=$oldIFS
+	tc_escaped="${tc_script}${xo_fmt:+__${xo_fmt}}"
+
+	atf_test_case ${tc_escaped}
+	eval "${tc_escaped}_body() { check ${tc_script} ${xo_fmt}; }"
+	atf_add_test_case ${tc_escaped}
+}
+
+atf_init_test_cases()
+{
+	for path in $(find -Es "${SRCDIR}" -name '*.out'); do
+		add_testcase ${path##*/}
+	done
+}