From owner-svn-src-stable@freebsd.org Sun Nov 15 22:13:43 2015 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 72440A300B1; Sun, 15 Nov 2015 22:13:43 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 4AC2C11A1; Sun, 15 Nov 2015 22:13:43 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tAFMDgKR024285; Sun, 15 Nov 2015 22:13:42 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAFMDf9W024278; Sun, 15 Nov 2015 22:13:41 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201511152213.tAFMDf9W024278@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Sun, 15 Nov 2015 22:13:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r290892 - in stable/10: etc/mtree lib/libarchive lib/libarchive/test lib/libarchive/tests usr.bin/cpio usr.bin/cpio/test usr.bin/cpio/tests usr.bin/tar usr.bin/tar/test usr.bin/tar/tests X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Nov 2015 22:13:43 -0000 Author: ngie Date: Sun Nov 15 22:13:41 2015 New Revision: 290892 URL: https://svnweb.freebsd.org/changeset/base/290892 Log: 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 Added: stable/10/lib/libarchive/tests/ - copied from r289195, head/lib/libarchive/tests/ stable/10/usr.bin/cpio/tests/ - copied from r289195, head/usr.bin/cpio/tests/ stable/10/usr.bin/tar/tests/ - copied from r289195, head/usr.bin/tar/tests/ Deleted: stable/10/lib/libarchive/test/ stable/10/usr.bin/cpio/test/ stable/10/usr.bin/tar/test/ Modified: stable/10/etc/mtree/BSD.tests.dist stable/10/lib/libarchive/Makefile stable/10/lib/libarchive/tests/Makefile stable/10/usr.bin/cpio/Makefile stable/10/usr.bin/cpio/tests/Makefile stable/10/usr.bin/tar/Makefile stable/10/usr.bin/tar/tests/Makefile Directory Properties: stable/10/ (props changed) Modified: stable/10/etc/mtree/BSD.tests.dist ============================================================================== --- stable/10/etc/mtree/BSD.tests.dist Sun Nov 15 21:58:04 2015 (r290891) +++ stable/10/etc/mtree/BSD.tests.dist Sun Nov 15 22:13:41 2015 (r290892) @@ -80,6 +80,8 @@ test-programs .. .. + libarchive + .. libc c063 .. @@ -348,6 +350,8 @@ .. cmp .. + cpio + .. col .. comm @@ -380,6 +384,8 @@ regress.multitest.out .. .. + tar + .. timeout .. tr Modified: stable/10/lib/libarchive/Makefile ============================================================================== --- stable/10/lib/libarchive/Makefile Sun Nov 15 21:58:04 2015 (r290891) +++ stable/10/lib/libarchive/Makefile Sun Nov 15 22:13:41 2015 (r290892) @@ -410,11 +410,8 @@ MLINKS+= archive_write_set_options.3 arc MLINKS+= archive_write_set_options.3 archive_write_set_option.3 MLINKS+= libarchive.3 archive.3 -.PHONY: check test clean-test -check test: - cd ${.CURDIR}/test && make obj && make test - -clean-test: - cd ${.CURDIR}/test && make clean +.if ${MK_TESTS} != "no" +SUBDIR+= tests +.endif .include Modified: stable/10/lib/libarchive/tests/Makefile ============================================================================== --- head/lib/libarchive/tests/Makefile Mon Oct 12 18:31:21 2015 (r289195) +++ stable/10/lib/libarchive/tests/Makefile Sun Nov 15 22:13:41 2015 (r290892) @@ -1,5 +1,8 @@ # $FreeBSD$ +SRCTOP= ${.CURDIR:H:H:H} +TESTSDIR= ${TESTSBASE}/lib/libarchive + LIBARCHIVEDIR= ${SRCTOP}/contrib/libarchive ATF_TESTS_SH+= functional_test @@ -249,7 +252,8 @@ SRCS.libarchive_test= \ DPSRCS.libarchive_test= \ list.h -LIBADD.libarchive_test= archive +DPADD.libarchive_test= ${LIBARCHIVE} +LDADD.libarchive_test= -larchive .PATH: ${LIBARCHIVEDIR}/test_utils SRCS.libarchive_test+= test_utils.c Modified: stable/10/usr.bin/cpio/Makefile ============================================================================== --- stable/10/usr.bin/cpio/Makefile Sun Nov 15 21:58:04 2015 (r290891) +++ stable/10/usr.bin/cpio/Makefile Sun Nov 15 22:13:41 2015 (r290892) @@ -40,12 +40,8 @@ CFLAGS+= -DHAVE_ICONV=1 -DHAVE_ICONV_H=1 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 Modified: stable/10/usr.bin/cpio/tests/Makefile ============================================================================== --- head/usr.bin/cpio/tests/Makefile Mon Oct 12 18:31:21 2015 (r289195) +++ stable/10/usr.bin/cpio/tests/Makefile Sun Nov 15 22:13:41 2015 (r290892) @@ -1,5 +1,8 @@ # $FreeBSD$ +SRCTOP= ${.CURDIR:H:H:H} +TESTSDIR= ${TESTSBASE}/usr.bin/cpio + LIBARCHIVEDIR= ${SRCTOP}/contrib/libarchive ATF_TESTS_SH+= functional_test @@ -81,7 +84,8 @@ DPSRCS.bsdcpio_test= \ .PATH: ${LIBARCHIVEDIR}/test_utils SRCS.bsdcpio_test+= test_utils.c -LIBADD.bsdcpio_test= archive +DPADD.bsdcpio_test= ${LIBARCHIVE} +LDADD.bsdcpio_test= -larchive list.h: ${TESTS_SRCS} Makefile @(cd ${LIBARCHIVEDIR}/tar/test && \ Modified: stable/10/usr.bin/tar/Makefile ============================================================================== --- stable/10/usr.bin/tar/Makefile Sun Nov 15 21:58:04 2015 (r290891) +++ stable/10/usr.bin/tar/Makefile Sun Nov 15 22:13:41 2015 (r290892) @@ -40,11 +40,8 @@ CFLAGS+= -I${LIBARCHIVEDIR}/libarchive_f 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 Modified: stable/10/usr.bin/tar/tests/Makefile ============================================================================== --- head/usr.bin/tar/tests/Makefile Mon Oct 12 18:31:21 2015 (r289195) +++ stable/10/usr.bin/tar/tests/Makefile Sun Nov 15 22:13:41 2015 (r290892) @@ -1,5 +1,8 @@ # $FreeBSD$ +SRCTOP= ${.CURDIR:H:H:H} +TESTSDIR= ${TESTSBASE}/usr.bin/tar + LIBARCHIVEDIR= ${SRCTOP}/contrib/libarchive ATF_TESTS_SH+= functional_test @@ -80,7 +83,8 @@ DPSRCS.bsdtar_test+= list.h .PATH: ${LIBARCHIVEDIR}/test_utils SRCS.bsdtar_test+= test_utils.c -LIBADD.bsdtar_test= archive +DPADD.bsdtar_test= ${LIBARCHIVE} +LDADD.bsdtar_test= -larchive list.h: ${TESTS_SRCS} Makefile @(cd ${LIBARCHIVEDIR}/tar/test && \