Author: ngie
Date: Sat Feb 25 00:42:44 2017
New Revision: 314236
URL: https://svnweb.freebsd.org/changeset/base/314236
Log:
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".
Modified:
stable/10/Makefile.inc1
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/Makefile.inc1
==============================================================================
--- stable/10/Makefile.inc1 Sat Feb 25 00:42:17 2017 (r314235)
+++ stable/10/Makefile.inc1 Sat Feb 25 00:42:44 2017 (r314236)
@@ -1199,11 +1199,11 @@ packagekernel:
# 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
#
#
@@ -1212,7 +1212,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
_______________________________________________
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"
