MFC r289195:

Integrate the tests from lib/libarchive, usr.bin/cpio, and usr.bin/tar in to
the FreeBSD test suite

functional_test.sh was ported from bin/sh/tests/functional_test.sh, as a
small wrapper around libarchive_test, bsdcpio_test, and bsdtar_test provided
by upstream.

A handful of testcases in lib/libarchive/tests have been disabled as they
were failing when run with kyua test (see BROKEN_TESTS in
lib/libarchive/tests/Makefile)

As a sidenote: this removes the check/test targets from the Makefiles as they
don't match the pattern used in the rest of the FreeBSD test suite.

Sponsored by: EMC / Isilon Storage Division

Conflicts:
	lib/libarchive/test
	usr.bin/cpio/test

3 files changed, 103 insertions, 44 deletions

diff --git a/usr.bin/tar/Makefile b/usr.bin/tar/Makefile
index 2b42adc..06d9629 100644
--- a/usr.bin/tar/Makefile
+++ b/usr.bin/tar/Makefile
@@ -40,11 +40,8 @@ CFLAGS+=	-I${LIBARCHIVEDIR}/libarchive_fe
 SYMLINKS=	bsdtar ${BINDIR}/tar
 MLINKS=	bsdtar.1 tar.1
 
-.PHONY: check test clean-test
-check test: $(PROG) bsdtar.1.gz
-	cd ${.CURDIR}/test && make obj && make test
-
-clean-test:
-	cd ${.CURDIR}/test && make clean
+.if ${MK_TESTS} != "no"
+SUBDIR+=	tests
+.endif
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/tar/test/Makefile b/usr.bin/tar/tests/Makefile
index 89d0242..c356009 100644
--- a/usr.bin/tar/test/Makefile
+++ b/usr.bin/tar/tests/Makefile
@@ -1,9 +1,27 @@
 # $FreeBSD$
 
-LIBARCHIVEDIR=	${.CURDIR}/../../../contrib/libarchive
+SRCTOP=		${.CURDIR:H:H:H}
+TESTSDIR=	${TESTSBASE}/usr.bin/tar
+
+LIBARCHIVEDIR=	${SRCTOP}/contrib/libarchive
+
+ATF_TESTS_SH+=	functional_test
+
+BINDIR=		${TESTSDIR}
+
+CFLAGS+=	-DPLATFORM_CONFIG_H=\"${SRCTOP}/lib/libarchive/config_freebsd.h\"
+CFLAGS+=	-static
+CFLAGS+=	-I${SRCTOP}/lib/libarchive -I${.OBJDIR}
+CFLAGS+=	-I${LIBARCHIVEDIR}/tar -I${LIBARCHIVEDIR}/test_utils
+
+# Uncomment to link against dmalloc
+#LDADD+= -L/usr/local/lib -ldmalloc
+#CFLAGS+= -I/usr/local/include -DUSE_DMALLOC
+
+PROGS+=		bsdtar_test
 
 .PATH: ${LIBARCHIVEDIR}/tar/test
-TESTS=	\
+TESTS_SRCS=	\
 	test_0.c				\
 	test_basic.c				\
 	test_copy.c				\
@@ -55,47 +73,40 @@ TESTS=	\
 	test_symlink_dir.c			\
 	test_version.c
 
-# Build the test program
-SRCS=	${TAR_SRCS}				\
-	${TESTS}				\
-	list.h					\
+SRCS.bsdtar_test=	\
+	${TESTS_SRCS}	\
+	list.h		\
 	main.c
 
+DPSRCS.bsdtar_test+=	list.h
+
 .PATH: ${LIBARCHIVEDIR}/test_utils
-SRCS+=	test_utils.c
+SRCS.bsdtar_test+=	test_utils.c
 
-CLEANFILES+= list.h
+DPADD.bsdtar_test=	${LIBARCHIVE}
+LDADD.bsdtar_test=	-larchive
 
-MAN=
+list.h: ${TESTS_SRCS} Makefile
+	@(cd ${LIBARCHIVEDIR}/tar/test && \
+	grep -h DEFINE_TEST ${.ALLSRC:N*Makefile}) > ${.TARGET}.tmp
+	@mv ${.TARGET}.tmp ${.TARGET}
 
-PROG=bsdtar_test
-DPADD=${LIBARCHIVE} ${LIBBZ2} ${LIBZ} ${LIBLZMA}
-CFLAGS+=	-DPLATFORM_CONFIG_H=\"${.CURDIR}/../../../lib/libarchive/config_freebsd.h\"
-LDADD= -larchive -lz -lbz2 -llzma
-CFLAGS+= -static -g -O2 -Wall
-CFLAGS+= -I${.CURDIR}/../../../lib/libarchive -I${.OBJDIR}
-CFLAGS+= -I${LIBARCHIVEDIR}/tar -I${LIBARCHIVEDIR}/test_utils
+CLEANFILES+=	list.h list.h.tmp
 
-# Uncomment to link against dmalloc
-#LDADD+= -L/usr/local/lib -ldmalloc
-#CFLAGS+= -I/usr/local/include -DUSE_DMALLOC
+FILES+=	test_extract.tar.Z.uu
+FILES+=	test_extract.tar.bz2.uu
+FILES+=	test_extract.tar.grz.uu
+FILES+=	test_extract.tar.gz.uu
+FILES+=	test_extract.tar.lrz.uu
+FILES+=	test_extract.tar.lz.uu
+FILES+=	test_extract.tar.lzma.uu
+FILES+=	test_extract.tar.lzo.uu
+FILES+=	test_extract.tar.xz.uu
+FILES+=	test_option_keep_newer_files.tar.Z.uu
+FILES+=	test_option_s.tar.Z.uu
+FILES+=	test_patterns_2.tar.uu
+FILES+=	test_patterns_3.tar.uu
+FILES+=	test_patterns_4.tar.uu
+FILES+=	test_print_longpath.tar.Z.uu
 
-check test:	bsdtar_test
-	./bsdtar_test -p ${.OBJDIR}/../bsdtar -r ${LIBARCHIVEDIR}/tar/test
-
-list.h: ${TESTS} Makefile
-	(cd ${LIBARCHIVEDIR}/tar/test; cat ${TESTS}) | \
-	grep DEFINE_TEST > ${.OBJDIR}/list.h
-
-clean:
-	rm -f ${CLEANFILES}
-	rm -f *.out
-	rm -f *.o
-	rm -f *.core
-	rm -f *~
-	rm -f list.h
-	rm -f archive.h ../archive.h
-	-chmod -R +w /tmp/bsdtar_test.*
-	rm -rf /tmp/bsdtar_test.*
-
-.include <bsd.prog.mk>
+.include <bsd.test.mk>
diff --git a/usr.bin/tar/tests/functional_test.sh b/usr.bin/tar/tests/functional_test.sh
new file mode 100755
index 0000000..ee9de1b
--- /dev/null
+++ b/usr.bin/tar/tests/functional_test.sh
@@ -0,0 +1,51 @@
+#
+# 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$
+
+export BSDTAR=$(which tar)
+SRCDIR=$(atf_get_srcdir)
+TESTER="${SRCDIR}/bsdtar_test"
+
+check()
+{
+	local testcase=${1}; shift
+
+	atf_check -o ignore -s exit:0 ${TESTER} -d -r "${SRCDIR}" -v "${testcase}"
+}
+
+atf_init_test_cases()
+{
+	# Redirect stderr to stdout for the usage message because if you don't
+	# kyua list/kyua test will break:
+	# https://github.com/jmmv/kyua/issues/149
+	testcases=$(${TESTER} -h 2>&1 | awk 'p != 0 && $1 ~ /^[0-9]+:/ { print $NF } /Available tests:/ { p=1 }')
+	for testcase in ${testcases}; do
+		atf_test_case ${testcase}
+		eval "${testcase}_body() { check ${testcase}; }"
+		atf_add_test_case ${testcase}
+	done
+}