Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 15 Nov 2015 22:13:41 +0000 (UTC)
From:      Garrett Cooper <ngie@FreeBSD.org>
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
Message-ID:  <201511152213.tAFMDf9W024278@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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 <bsd.lib.mk>

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 <bsd.prog.mk>

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 <bsd.prog.mk>

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 && \



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201511152213.tAFMDf9W024278>