aboutsummaryrefslogtreecommitdiffstats
path: root/usr.bin/cpio/Makefile
diff options
context:
space:
mode:
authorEnji Cooper <ngie@FreeBSD.org>2015-11-15 22:13:41 +0000
committerEnji Cooper <ngie@FreeBSD.org>2015-11-15 22:13:41 +0000
commit36436fbe869e79345629dd11489b6872635923c0 (patch)
tree87021568ed1e7dd53441c6aebdc2abad88cb3cfb /usr.bin/cpio/Makefile
parent3d48537e6cf574575f125aff60289bfab4f4f9ba (diff)
downloadsrc-36436fbe869e79345629dd11489b6872635923c0.tar.gz
src-36436fbe869e79345629dd11489b6872635923c0.zip
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
Notes
Notes: svn path=/stable/10/; revision=290892
Diffstat (limited to 'usr.bin/cpio/Makefile')
-rw-r--r--usr.bin/cpio/Makefile10
1 files changed, 3 insertions, 7 deletions
diff --git a/usr.bin/cpio/Makefile b/usr.bin/cpio/Makefile
index 635f4bce11ad..eeed435579a7 100644
--- a/usr.bin/cpio/Makefile
+++ b/usr.bin/cpio/Makefile
@@ -40,12 +40,8 @@ CFLAGS+= -DHAVE_ICONV=1 -DHAVE_ICONV_H=1 -DICONV_CONST=const
SYMLINKS=bsdcpio ${BINDIR}/cpio
MLINKS= bsdcpio.1 cpio.1
-.PHONY: check test clean-test
-
-check test: $(PROG) bsdcpio.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>