svn commit: r321647 - in stable/11/share/examples/tests/tests: . atf plain

[Ngie Cooper]

Author: ngie
Date: Fri Jul 28 03:32:36 2017
New Revision: 321647
URL: https://svnweb.freebsd.org/changeset/base/321647

Log:
  MFC r320441,r320442:
  
  r320441:
  
  share/examples/tests/Makefile: clean up example snippets/documentation
  
  - TESTSDIR doesn't need to be specified after r289158.
  - Including bsd.own.mk isn't required since no MK_<foo> knobs are being
    manipulated.
  - TESTS_SUBDIRS should be written out in an append format, one entry
    per line, to provide a better, more conflict resistant example.
  
  r320442:
  
  share/examples/tests/{atf,plain}/Makefile: tweak example Makefile snippets
  
  - Including bsd.own.mk isn't required since no MK_<foo> knobs are being
    manipulated.
  - Update documentation to note that ${FILES} is installed via bsd.progs.mk,
    not bsd.prog.mk.

Modified:
  stable/11/share/examples/tests/tests/Makefile
  stable/11/share/examples/tests/tests/atf/Makefile
  stable/11/share/examples/tests/tests/plain/Makefile
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/share/examples/tests/tests/Makefile
==============================================================================
--- stable/11/share/examples/tests/tests/Makefile	Fri Jul 28 03:30:46 2017	(r321646)
+++ stable/11/share/examples/tests/tests/Makefile	Fri Jul 28 03:32:36 2017	(r321647)
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-.include <bsd.own.mk>
-
 # Directory into which the Kyuafile provided by this directory will be
 # installed.
 #
@@ -11,12 +9,16 @@
 #
 # For example: if this Makefile were in src/bin/cp/tests/, its TESTSDIR
 # would point at ${TESTSBASE}/bin/cp/.
-TESTSDIR=	${TESTSBASE}/share/examples/tests
+#
+# The default path specified by bsd.test.mk is `${TESTSBASE}/${RELDIR:H}`,
+# which happens to be the same as `${TESTSBASE}/share/examples/tests`.
+#TESTSDIR=	${TESTSBASE}/share/examples/tests
 
 # List of subdirectories into which we want to recurse during the build
 # 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+=	atf
+TESTS_SUBDIRS+=	plain
 TESTS_SUBDIRS+=	tap
 
 # We leave KYUAFILE unset so that bsd.test.mk auto-generates a Kyuafile

Modified: stable/11/share/examples/tests/tests/atf/Makefile
==============================================================================
--- stable/11/share/examples/tests/tests/atf/Makefile	Fri Jul 28 03:30:46 2017	(r321646)
+++ stable/11/share/examples/tests/tests/atf/Makefile	Fri Jul 28 03:32:36 2017	(r321647)
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-.include <bsd.own.mk>
-
 # The release package to use for the tests contained within the directory
 #
 # This applies to components which rely on ^/projects/release-pkg support
@@ -33,10 +31,10 @@ ATF_TESTS_SH=	cp_test
 # definitions from above.
 KYUAFILE=	yes
 
-# Install file1 and file2 as files via bsd.prog.mk. Please note the intentional
+# Install file1 and file2 as files via bsd.progs.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
+# The basic semantics of this are the same as FILES in bsd.progs.mk, e.g. the
 # installation of the files can be manipulated via ${PACKAGE}FILESDIR,
 # ${PACKAGE}FILESMODE, etc.
 #

Modified: stable/11/share/examples/tests/tests/plain/Makefile
==============================================================================
--- stable/11/share/examples/tests/tests/plain/Makefile	Fri Jul 28 03:30:46 2017	(r321646)
+++ stable/11/share/examples/tests/tests/plain/Makefile	Fri Jul 28 03:32:36 2017	(r321647)
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-.include <bsd.own.mk>
-
 # The release package to use for the tests contained within the directory
 #
 # This applies to components which rely on ^/projects/release-pkg support
@@ -33,10 +31,10 @@ PLAIN_TESTS_SH=	cp_test
 # definitions from above.
 KYUAFILE=	yes
 
-# Install file1 and file2 as files via bsd.prog.mk. Please note the intentional
+# Install file1 and file2 as files via bsd.progs.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
+# The basic semantics of this are the same as FILES in bsd.progs.mk, e.g. the
 # installation of the files can be manipulated via ${PACKAGE}FILESDIR,
 # ${PACKAGE}FILESMODE, etc.
 #