Date: Thu, 8 Oct 2015 19:10:51 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r289050 - stable/10/share/mk Message-ID: <201510081910.t98JApW5073365@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Thu Oct 8 19:10:51 2015 New Revision: 289050 URL: https://svnweb.freebsd.org/changeset/base/289050 Log: Direct commit to fix usage with fmake. fmake does not have :tW, so use some clever :Q tricks to achieve the same result. This won't work if PATH actually contains spaces, but it's better than not working at all. Modified: stable/10/share/mk/bsd.test.mk stable/10/share/mk/suite.test.mk Modified: stable/10/share/mk/bsd.test.mk ============================================================================== --- stable/10/share/mk/bsd.test.mk Thu Oct 8 18:33:47 2015 (r289049) +++ stable/10/share/mk/bsd.test.mk Thu Oct 8 19:10:51 2015 (r289050) @@ -43,11 +43,19 @@ DISTRIBUTION:= tests # Ordered list of directories to construct the PATH for the tests. TESTS_PATH+= ${DESTDIR}/bin ${DESTDIR}/sbin \ ${DESTDIR}/usr/bin ${DESTDIR}/usr/sbin +.if defined(.PARSEDIR) TESTS_ENV+= PATH=${TESTS_PATH:tW:C/ +/:/g} +.else +TESTS_ENV+= PATH=${TESTS_PATH:N :Q:S,\\ ,:,g} +.endif # Ordered list of directories to construct the LD_LIBRARY_PATH for the tests. TESTS_LD_LIBRARY_PATH+= ${DESTDIR}/lib ${DESTDIR}/usr/lib +.if defined(.PARSEDIR) TESTS_ENV+= LD_LIBRARY_PATH=${TESTS_LD_LIBRARY_PATH:tW:C/ +/:/g} +.else +TESTS_ENV+= LD_LIBRARY_PATH=${TESTS_LD_LIBRARY_PATH:N :Q:S,\\ ,:,g} +.endif # List of all tests being built. The various *.test.mk modules extend this # variable as needed. Modified: stable/10/share/mk/suite.test.mk ============================================================================== --- stable/10/share/mk/suite.test.mk Thu Oct 8 18:33:47 2015 (r289049) +++ stable/10/share/mk/suite.test.mk Thu Oct 8 19:10:51 2015 (r289050) @@ -72,8 +72,13 @@ Kyuafile.auto: Makefile echo; \ } >Kyuafile.auto.tmp .for _T in ${_TESTS} +.if defined(.PARSEDIR) @echo '${TEST_INTERFACE.${_T}}_test_program{name="${_T}"${TEST_METADATA.${_T}:C/$/,/:tW:C/^/, /W:C/,$//W}}' \ >>Kyuafile.auto.tmp +.else + @echo '${TEST_INTERFACE.${_T}}_test_program{name="${_T}"${TEST_METADATA.${_T}:C/^/, /:Q:S/\\ ,/,/g:S,\\,,g}}' \ + >>Kyuafile.auto.tmp +.endif .endfor .for _T in ${TESTS_SUBDIRS:N.WAIT} @echo "include(\"${_T}/Kyuafile\")" >>Kyuafile.auto.tmp
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201510081910.t98JApW5073365>