From owner-svn-src-all@freebsd.org Thu Oct 8 19:10:52 2015 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id F12899D29DA; Thu, 8 Oct 2015 19:10:52 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A339511D3; Thu, 8 Oct 2015 19:10:52 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t98JAp60073367; Thu, 8 Oct 2015 19:10:51 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t98JApW5073365; Thu, 8 Oct 2015 19:10:51 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201510081910.t98JApW5073365@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Thu, 8 Oct 2015 19:10:51 +0000 (UTC) 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 X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 08 Oct 2015 19:10:53 -0000 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