Date: Fri, 28 Jul 2017 03:30:46 +0000 (UTC) From: Ngie 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: r321646 - in stable/10: etc/mtree share/examples/tests/tests share/examples/tests/tests/tap Message-ID: <201707280330.v6S3Uk3P038364@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ngie Date: Fri Jul 28 03:30:46 2017 New Revision: 321646 URL: https://svnweb.freebsd.org/changeset/base/321646 Log: MFC r320443,r320444: r320443: Add kyua TAP test integration examples The examples are patterned loosely after the ATF examples, similar to the plain test examples. r320444: Commit the corresponding mtree file change for the TAP test examples MFC with: r320443 Added: stable/10/share/examples/tests/tests/tap/ - copied from r320443, head/share/examples/tests/tests/tap/ Modified: stable/10/etc/mtree/BSD.tests.dist stable/10/share/examples/tests/tests/Makefile stable/10/share/examples/tests/tests/tap/Makefile Directory Properties: stable/10/ (props changed) Modified: stable/10/etc/mtree/BSD.tests.dist ============================================================================== --- stable/10/etc/mtree/BSD.tests.dist Fri Jul 28 03:27:41 2017 (r321645) +++ stable/10/etc/mtree/BSD.tests.dist Fri Jul 28 03:30:46 2017 (r321646) @@ -370,6 +370,8 @@ .. plain .. + tap + .. .. .. .. Modified: stable/10/share/examples/tests/tests/Makefile ============================================================================== --- stable/10/share/examples/tests/tests/Makefile Fri Jul 28 03:27:41 2017 (r321645) +++ stable/10/share/examples/tests/tests/Makefile Fri Jul 28 03:30:46 2017 (r321646) @@ -17,6 +17,7 @@ TESTSDIR= ${TESTSBASE}/share/examples/tests # of the system. We use TESTS_SUBDIRS instead of SUBDIR because we want # the auto-generated Kyuafile to recurse into these directories. TESTS_SUBDIRS= atf plain +TESTS_SUBDIRS+= tap # We leave KYUAFILE unset so that bsd.test.mk auto-generates a Kyuafile # for us based on the contents of the TESTS_SUBDIRS line above. The Modified: stable/10/share/examples/tests/tests/tap/Makefile ============================================================================== --- head/share/examples/tests/tests/tap/Makefile Wed Jun 28 08:22:04 2017 (r320443) +++ stable/10/share/examples/tests/tests/tap/Makefile Fri Jul 28 03:30:46 2017 (r321646) @@ -1,11 +1,5 @@ # $FreeBSD$ -# The release package to use for the tests contained within the directory -# -# This applies to components which rely on ^/projects/release-pkg support -# (see UPDATING XXXXXXXXX / svn revision r298107). -PACKAGE= tests - # Directory into which the Kyuafile provided by this directory will be # installed. # @@ -31,17 +25,10 @@ TAP_TESTS_SH= cp_test # definitions from above. KYUAFILE= yes -# Install file1 and file2 as files via bsd.prog.mk. Please note the intentional -# ${PACKAGE} namespace of files. -# -# The basic semantics of this are the same as FILES in bsd.prog.mk, e.g. the -# installation of the files can be manipulated via ${PACKAGE}FILESDIR, -# ${PACKAGE}FILESMODE, etc. -# -# Please see comment above about ${PACKAGE}. Feel free to omit the ${PACKAGE} -# namespace if release package support isn't needed. -${PACKAGE}FILES+= file1 -CLEANFILES+= file1 +# Install file1 and file2 as files via bsd.prog.mk. +FILES+= file1 +FILESDIR= ${TESTSDIR} +CLEANFILES+= file1 file1: @echo "File 1" > ${.TARGET}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201707280330.v6S3Uk3P038364>