Module Name: src
Committed By: martin
Date: Thu Mar 1 19:04:57 UTC 2018
Modified Files:
src/share/mk [netbsd-8]: bsd.test.mk
src/tests/lib [netbsd-8]: Makefile
Log Message:
Pull up following revision(s) (requested by kre in ticket #598):
tests/lib/Makefile: revision 1.30
share/mk/bsd.test.mk: revision 1.25
PR lib/52007
Provide a mechanism whereby a test sub-directory can be installed,
without the test being scheduled to run by default (ie: keeping
it out of the Atffile, and Kyuafile if Kyua is enabled.).
The mechanism is perhaps a bit kludgey - anyone with a better idea
how to make it happen, feel free to improve this (the one user as
of about the time of this commit is (or will be) src/tests/lib/Makefile)
PR lib/52007
Move libevent from being a test playing sub-directory, to a groupy,
just hanging around, hoping someone will notice it, and throw it
a bone... (mixed metaphors?)
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.24.22.1 src/share/mk/bsd.test.mk
cvs rdiff -u -r1.29 -r1.29.2.1 src/tests/lib/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.test.mk
diff -u src/share/mk/bsd.test.mk:1.24 src/share/mk/bsd.test.mk:1.24.22.1
--- src/share/mk/bsd.test.mk:1.24 Sat Feb 23 22:01:51 2013
+++ src/share/mk/bsd.test.mk Thu Mar 1 19:04:57 2018
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.test.mk,v 1.24 2013/02/23 22:01:51 jmmv Exp $
+# $NetBSD: bsd.test.mk,v 1.24.22.1 2018/03/01 19:04:57 martin Exp $
#
.include <bsd.init.mk>
@@ -8,6 +8,9 @@ _TESTS:= # empty
.if defined(TESTS_SUBDIRS)
SUBDIR+= ${TESTS_SUBDIRS}
.endif
+.if defined(TESTS_SUBDIR_INSTALL_ONLY)
+SUBDIR+= ${TESTS_SUBDIR_INSTALL_ONLY}
+.endif
.include <bsd.subdir.mk>
Index: src/tests/lib/Makefile
diff -u src/tests/lib/Makefile:1.29 src/tests/lib/Makefile:1.29.2.1
--- src/tests/lib/Makefile:1.29 Sun May 21 15:28:42 2017
+++ src/tests/lib/Makefile Thu Mar 1 19:04:57 2018
@@ -1,12 +1,14 @@
-# $NetBSD: Makefile,v 1.29 2017/05/21 15:28:42 riastradh Exp $
+# $NetBSD: Makefile,v 1.29.2.1 2018/03/01 19:04:57 martin Exp $
.include <bsd.own.mk>
-TESTS_SUBDIRS= csu libbluetooth libc libcrypt libcurses libevent libexecinfo \
+TESTS_SUBDIRS= csu libbluetooth libc libcrypt libcurses libexecinfo \
libm libobjc libposix libppath libprop libpthread \
librefuse librt libtre libusbhid libutil \
semaphore
+TESTS_SUBDIR_INSTALL_ONLY= libevent
+
.if (${MKRUMP} != "no") && !defined(BSD_MK_COMPAT_FILE)
TESTS_SUBDIRS+= librumpclient librumphijack
.endif
