d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Default TESTSDIR to /usr/tests/${RELDIR:H}

Browse Source 
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
This commit is contained in:
Enji Cooper 2015-10-11 21:29:24 +00:00
parent ae92db9ed6
commit da3110ed56
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=289158
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
share/mk/bsd.README
View File

@ -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

5
share/mk/bsd.test.mk
View File

@ -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