Index: head/bin/sh/tests/Makefile =================================================================== --- head/bin/sh/tests/Makefile (revision 295642) +++ head/bin/sh/tests/Makefile (revision 295643) @@ -1,15 +1,13 @@ # $FreeBSD$ .include TESTS_SUBDIRS+= builtins TESTS_SUBDIRS+= errors TESTS_SUBDIRS+= execution TESTS_SUBDIRS+= expansion TESTS_SUBDIRS+= parameters TESTS_SUBDIRS+= parser TESTS_SUBDIRS+= set-e -SUBDIR_PARALLEL= - .include Index: head/cddl/usr.sbin/dtrace/tests/common/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/Makefile (revision 295642) +++ head/cddl/usr.sbin/dtrace/tests/common/Makefile (revision 295643) @@ -1,91 +1,89 @@ # $FreeBSD$ # We exclude several subdirectories: nfs and sysevent do not compile on # FreeBSD, and docsExamples doesn't seem amenable to automated testing. TESTSDIR= ${TESTSBASE}/cddl/usr.sbin/dtrace/common TESTS_SUBDIRS+= aggs \ arithmetic \ arrays \ assocs \ begin \ bitfields \ buffering \ builtinvar \ cg \ clauses \ cpc \ decls \ drops \ dtraceUtil \ end \ enum \ error \ exit \ fbtprovider \ funcs \ grammar \ include \ inline \ io \ ip \ java_api \ json \ lexer \ llquantize \ mdb \ mib \ misc \ multiaggs \ offsetof \ operators \ pid \ plockstat \ pointers \ pragma \ predicates \ preprocessor \ print \ printa \ printf \ privs \ probes \ proc \ profile-n \ providers \ raise \ rates \ safety \ scalars \ sched \ scripting \ sdt \ sizeof \ speculation \ stability \ stack \ stackdepth \ stop \ strlen \ strtoll \ struct \ syscall \ tick-n \ trace \ tracemem \ translators \ typedef \ types \ uctf \ union \ usdt \ ustack \ vars \ version \ .PATH: ${.CURDIR:H:H:H:H:H}/tests KYUAFILE= YES -SUBDIR_PARALLEL= - .include Index: head/share/mk/bsd.test.mk =================================================================== --- head/share/mk/bsd.test.mk (revision 295642) +++ head/share/mk/bsd.test.mk (revision 295643) @@ -1,121 +1,122 @@ # $FreeBSD$ # # Generic build infrastructure for test programs. # # This is the only public file that should be included by Makefiles when # tests are to be built. All other *.test.mk files are internal and not # to be included directly. .include ____: # Third-party software (kyua, etc) prefix. LOCALBASE?= /usr/local # Tests install directory TESTSDIR?= ${TESTSBASE}/${RELDIR:H} # List of subdirectories containing tests into which to recurse. This has the # same semantics as SUBDIR at build-time. However, the directories listed here # get registered into the run-time test suite definitions so that the test # engines know to recurse into these directories. # # In other words: list here any directories that contain test programs but use # SUBDIR for directories that may contain helper binaries and/or data files. TESTS_SUBDIRS?= # If defined, indicates that the tests built by the Makefile are not part of # the FreeBSD Test Suite. The implication of this is that the tests won't be # installed under /usr/tests/ and that Kyua won't be able to run them. #NOT_FOR_TEST_SUITE= # List of variables to pass to the tests at run-time via the environment. TESTS_ENV?= # Force all tests in a separate distribution file. # # We want this to be the case even when the distribution name is already # overriden. For example: we want the tests for programs in the 'games' # distribution to end up in the 'tests' distribution; the test programs # themselves have all the necessary logic to detect that the games are not # installed and thus won't cause false negatives. DISTRIBUTION:= tests # Ordered list of directories to construct the PATH for the tests. TESTS_PATH+= ${DESTDIR}/bin ${DESTDIR}/sbin \ ${DESTDIR}/usr/bin ${DESTDIR}/usr/sbin TESTS_ENV+= PATH=${TESTS_PATH:tW:C/ +/:/g} # Ordered list of directories to construct the LD_LIBRARY_PATH for the tests. TESTS_LD_LIBRARY_PATH+= ${DESTDIR}/lib ${DESTDIR}/usr/lib TESTS_ENV+= LD_LIBRARY_PATH=${TESTS_LD_LIBRARY_PATH:tW:C/ +/:/g} # List of all tests being built. The various *.test.mk modules extend this # variable as needed. _TESTS= # Pull in the definitions of all supported test interfaces. .include .include .include # kyua automatically descends directories; only run make check on the # top-level directory .if !make(check) .for ts in ${TESTS_SUBDIRS} .if empty(SUBDIR:M${ts}) SUBDIR+= ${ts} .endif .endfor +SUBDIR_PARALLEL= t .endif # it is rare for test cases to have man pages .if !defined(MAN) MAN= .endif # tell progs.mk we might want to install things PROG_VARS+= BINDIR PROGS_TARGETS+= install .if !defined(NOT_FOR_TEST_SUITE) .include .endif .if !target(realcheck) realcheck: .PHONY @echo "$@ not defined; skipping" .endif beforecheck realcheck aftercheck check: .PHONY .ORDER: beforecheck realcheck aftercheck check: beforecheck realcheck aftercheck .ifdef PROG # we came here via bsd.progs.mk below # parent will do staging. MK_STAGING= no .endif .if !empty(PROGS) || !empty(PROGS_CXX) || !empty(SCRIPTS) .include .endif .include .if !defined(PROG) && ${MK_STAGING} != "no" .if !defined(_SKIP_BUILD) # this will handle staging if needed _SKIP_STAGING= no # but we don't want it to build anything _SKIP_BUILD= .endif .if !empty(PROGS) stage_files.prog: ${PROGS} .endif .include .endif .if !target(objwarn) .include .endif Index: head/tests/sys/Makefile =================================================================== --- head/tests/sys/Makefile (revision 295642) +++ head/tests/sys/Makefile (revision 295643) @@ -1,27 +1,25 @@ # $FreeBSD$ .include TESTSDIR= ${TESTSBASE}/sys TESTS_SUBDIRS+= acl TESTS_SUBDIRS+= aio TESTS_SUBDIRS+= fifo TESTS_SUBDIRS+= file TESTS_SUBDIRS+= geom TESTS_SUBDIRS+= kern TESTS_SUBDIRS+= kqueue TESTS_SUBDIRS+= mac TESTS_SUBDIRS+= mqueue TESTS_SUBDIRS+= netinet TESTS_SUBDIRS+= opencrypto TESTS_SUBDIRS+= posixshm TESTS_SUBDIRS+= vfs TESTS_SUBDIRS+= vm # Items not integrated into kyua runs by default SUBDIR+= pjdfstest -SUBDIR_PARALLEL= - .include Index: head/tests/sys/pjdfstest/tests/Makefile =================================================================== --- head/tests/sys/pjdfstest/tests/Makefile (revision 295642) +++ head/tests/sys/pjdfstest/tests/Makefile (revision 295643) @@ -1,41 +1,39 @@ # $FreeBSD$ PJDFSTEST_SRCDIR= ${SRCTOP}/contrib/pjdfstest TESTSDIR= ${TESTSBASE}/sys/pjdfstest .PATH: ${.CURDIR} FILESDIR= ${TESTSDIR} FILES= conf FILES+= misc.sh CLEANFILES+= misc.sh misc.sh.tmp misc.sh: ${PJDFSTEST_SRCDIR}/tests/misc.sh sed -e '\,maindir=,s,maindir=.*,maindir=`dirname $$0`/../,' < ${.ALLSRC} > ${.TARGET}.tmp mv ${.TARGET}.tmp ${.TARGET} afterinstall: install-tests-symlink install-tests-symlink: .PHONY rm -f ${DESTDIR}${TESTSDIR}/tests ${INSTALL_SYMLINK} . ${DESTDIR}${TESTSDIR}/tests TESTS_SUBDIRS= chflags TESTS_SUBDIRS+= chmod TESTS_SUBDIRS+= chown TESTS_SUBDIRS+= ftruncate TESTS_SUBDIRS+= granular TESTS_SUBDIRS+= link TESTS_SUBDIRS+= mkdir TESTS_SUBDIRS+= mkfifo TESTS_SUBDIRS+= mknod TESTS_SUBDIRS+= open TESTS_SUBDIRS+= rename TESTS_SUBDIRS+= rmdir TESTS_SUBDIRS+= symlink TESTS_SUBDIRS+= truncate TESTS_SUBDIRS+= unlink -SUBDIR_PARALLEL= - .include Index: head/usr.bin/bmake/tests/Makefile.inc =================================================================== --- head/usr.bin/bmake/tests/Makefile.inc (nonexistent) +++ head/usr.bin/bmake/tests/Makefile.inc (revision 295643) @@ -0,0 +1,3 @@ +# $FreeBSD$ + +SUBDIR_PARALLEL= t Property changes on: head/usr.bin/bmake/tests/Makefile.inc ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property