svn commit: r322450 - in head/lib/libcasper: . services services/tests tests

[Ngie Cooper]

Author: ngie
Date: Sun Aug 13 01:04:44 2017
New Revision: 322450
URL: https://svnweb.freebsd.org/changeset/base/322450

Log:
  Integrate the tests moved in r305626 in to the FreeBSD test suite
  
  The reachover Kyuafiles were never added, and thus the tests were installed
  as standalone tests, and not integrated into the full suite.
  
  MFC after:	1 week
  MFC with:	r305626, 305629, r307863, r322447, r322448, r322449

Added:
  head/lib/libcasper/services/tests/
  head/lib/libcasper/services/tests/Makefile
     - copied, changed from r322439, head/tests/etc/Makefile
  head/lib/libcasper/tests/
  head/lib/libcasper/tests/Makefile
     - copied, changed from r322439, head/tests/etc/Makefile
Modified:
  head/lib/libcasper/Makefile
  head/lib/libcasper/services/Makefile

Modified: head/lib/libcasper/Makefile
==============================================================================
--- head/lib/libcasper/Makefile	Sun Aug 13 00:56:43 2017	(r322449)
+++ head/lib/libcasper/Makefile	Sun Aug 13 01:04:44 2017	(r322450)
@@ -3,6 +3,8 @@
 SUBDIR=		libcasper
 SUBDIR+=	services
 
+SUBDIR.${MK_TESTS}+=	tests
+
 SUBDIR_PARALLEL=
 
 .include <bsd.subdir.mk>

Modified: head/lib/libcasper/services/Makefile
==============================================================================
--- head/lib/libcasper/services/Makefile	Sun Aug 13 00:56:43 2017	(r322449)
+++ head/lib/libcasper/services/Makefile	Sun Aug 13 01:04:44 2017	(r322450)
@@ -6,6 +6,8 @@ SUBDIR+=	cap_pwd
 SUBDIR+=	cap_random
 SUBDIR+=	cap_sysctl
 
+SUBDIR.${MK_TESTS}+=	tests
+
 SUBDIR_PARALLEL=
 
 .include <bsd.subdir.mk>

Copied and modified: head/lib/libcasper/services/tests/Makefile (from r322439, head/tests/etc/Makefile)
==============================================================================
--- head/tests/etc/Makefile	Sat Aug 12 21:20:51 2017	(r322439, copy source)
+++ head/lib/libcasper/services/tests/Makefile	Sun Aug 13 01:04:44 2017	(r322450)
@@ -1,12 +1,8 @@
 # $FreeBSD$
 
-.include <bsd.own.mk>
+TESTSDIR=	${TESTSBASE}/lib/libcasper/services
 
-TESTSDIR=	${TESTSBASE}/etc
-
 .PATH:		${SRCTOP}/tests
 KYUAFILE=	yes
-
-SUBDIR+=	rc.d
 
 .include <bsd.test.mk>

Copied and modified: head/lib/libcasper/tests/Makefile (from r322439, head/tests/etc/Makefile)
==============================================================================
--- head/tests/etc/Makefile	Sat Aug 12 21:20:51 2017	(r322439, copy source)
+++ head/lib/libcasper/tests/Makefile	Sun Aug 13 01:04:44 2017	(r322450)
@@ -1,12 +1,8 @@
 # $FreeBSD$
 
-.include <bsd.own.mk>
+TESTSDIR=	${TESTSBASE}/lib/libcasper
 
-TESTSDIR=	${TESTSBASE}/etc
-
 .PATH:		${SRCTOP}/tests
 KYUAFILE=	yes
-
-SUBDIR+=	rc.d
 
 .include <bsd.test.mk>