diff options
| author | ngie <ngie@FreeBSD.org> | 2017-02-25 00:42:17 +0000 |
|---|---|---|
| committer | ngie <ngie@FreeBSD.org> | 2017-02-25 00:42:17 +0000 |
| commit | 68cdb7f76210f05d2ae41150a2003c21f99d770d (patch) | |
| tree | ac6866713bd1a298a15d4bcdf69f47da9c3572af /Makefile.inc1 | |
| parent | febb921d4d3545ff8ee5d8548e124de4580106fe (diff) | |
| download | FreeBSD-src-68cdb7f76210f05d2ae41150a2003c21f99d770d.zip FreeBSD-src-68cdb7f76210f05d2ae41150a2003c21f99d770d.tar.gz | |
MFC r313924,r313925:
r313924:
Quote path to doxygen/kyua in test(1) -x check
This is a basic stopgap against ${LOCALBASE} containing spaces in it
r313925:
Include ${LOCALBASE}/bin in $PATH when running "make checkworld"
Some of the tests in devel/atf // devel/kyua rely on the tools being in $PATH,
which means that the tests fail when run via "make checkworld" because $PATH
is restricted to exclude directory elements like "${LOCALBASE}/bin".
Diffstat (limited to 'Makefile.inc1')
| -rw-r--r-- | Makefile.inc1 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index ca049ea..c57b6fe 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1479,11 +1479,11 @@ sign-packages: _pkgbootstrap .PHONY # Run test suite on installed world. # checkworld: .PHONY - @if [ ! -x ${LOCALBASE}/bin/kyua ]; then \ + @if [ ! -x "${LOCALBASE}/bin/kyua" ]; then \ echo "You need kyua (devel/kyua) to run the test suite." | /usr/bin/fmt; \ exit 1; \ fi - ${_+_}${LOCALBASE}/bin/kyua test -k ${TESTSBASE}/Kyuafile + ${_+_}PATH="$$PATH:${LOCALBASE}/bin" kyua test -k ${TESTSBASE}/Kyuafile # # @@ -1492,7 +1492,7 @@ checkworld: .PHONY # Build the API documentation with doxygen # doxygen: .PHONY - @if [ ! -x ${LOCALBASE}/bin/doxygen ]; then \ + @if [ ! -x "${LOCALBASE}/bin/doxygen" ]; then \ echo "You need doxygen (devel/doxygen) to generate the API documentation of the kernel." | /usr/bin/fmt; \ exit 1; \ fi |
