Date: Sun, 11 Oct 2015 21:29:24 +0000 (UTC) From: Garrett Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r289158 - head/share/mk Message-ID: <201510112129.t9BLTONF096056@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ngie Date: Sun Oct 11 21:29:24 2015 New Revision: 289158 URL: https://svnweb.freebsd.org/changeset/base/289158 Log: Default TESTSDIR to /usr/tests/${RELDIR:H} When run from bin/ls/tests, for example, the value of TESTSDIR would be ${TESTSBASE}/${RELDIR:H} -> /usr/tests/bin/ls/tests/.. -> /usr/tests/bin/ls Document the new behavior in bsd.README. While here, also document TESTSBASE Relnotes: yes Differential Revision: D1022 MFC after: 2 weeks Sponsored by: EMC / Isilon Storage Division Modified: head/share/mk/bsd.README head/share/mk/bsd.test.mk Directory Properties: head/ (props changed) Modified: head/share/mk/bsd.README ============================================================================== --- head/share/mk/bsd.README Sun Oct 11 21:01:14 2015 (r289157) +++ head/share/mk/bsd.README Sun Oct 11 21:29:24 2015 (r289158) @@ -474,10 +474,16 @@ It has seven targets: It sets/uses the following variables, among many others: -TESTDIR Path to the installed tests. Must be a subdirectory of +TESTSBASE Installation prefix for tests. Defaults to /usr/tests + +TESTSDIR Path to the installed tests. Must be a subdirectory of TESTSBASE and the subpath should match the relative location of the tests within the src tree. + The value of TESTSDIR defaults to + ${TESTSBASE}/${RELDIR:H} , e.g. /usr/tests/bin/ls when + included from bin/ls/tests . + KYUAFILE If 'auto' (the default), generate a Kyuafile out of the test programs defined in the Makefile. If 'yes', then a manually-crafted Kyuafile must be supplied with the Modified: head/share/mk/bsd.test.mk ============================================================================== --- head/share/mk/bsd.test.mk Sun Oct 11 21:01:14 2015 (r289157) +++ head/share/mk/bsd.test.mk Sun Oct 11 21:29:24 2015 (r289158) @@ -10,9 +10,8 @@ __<bsd.test.mk>__: -.ifndef TESTSDIR -.error "Please define TESTSDIR when including bsd.test.mk" -.endif +# 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201510112129.t9BLTONF096056>