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

MFC r284408,r289151,r289158:

Browse Source 
r284408:

Ensure TESTSDIR is defined before bsd.test.mk is .include'd

r289151:

Simplify netbsd-tests.test.mk

- projects/bmake and subsequent commits provide SRCTOP; there's no need to
  manually specify it now.
- Compute a sane default for OBJTOP based on .OBJDIR and RELDIR. Manually
  specifying this is probably no longer needed, but it persists just in case
  (supporting commits will need to be made to move it out of some of the meta
  .mk files).
- Compute a sane default for TESTSRC. Error out if the path cannot be found.

Sponsored by: EMC / Isilon Storage Division

r289158:

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
Sponsored by: EMC / Isilon Storage Division
This commit is contained in:
ngie 2015-12-15 17:58:10 +00:00
parent 60b291250b
commit 73da3a2835
3 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
share/mk/bsd.README
View File

@ -425,10 +425,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

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

@ -10,6 +10,9 @@
__<bsd.test.mk>__:
# 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

12
share/mk/netbsd-tests.test.mk
View File

@ -3,16 +3,12 @@
.if !target(__netbsd_tests.test.mk__)
__netbsd_tests.test.mk__:
.if !defined(OBJTOP)
.error "Please define OBJTOP to the absolute path of the top of the object tree"
.endif
OBJTOP?= ${.OBJDIR:S/${RELDIR}//}
.if !defined(SRCTOP)
.error "Please define SRCTOP to the absolute path of the top of the source tree"
.endif
TESTSRC?= ${SRCTOP}/contrib/netbsd-tests/${RELDIR:H}
.if !defined(TESTSRC)
.error "Please define TESTSRC to the absolute path of the test sources, e.g. contrib/netbsd-tests/lib/libc/stdio"
.if !exists(${TESTSRC}/)
.error "Please define TESTSRC to the absolute path of the test sources, e.g. $${SRCTOP}/contrib/netbsd-tests/lib/libc/stdio"
.endif
.PATH: ${TESTSRC}