Date: Sun, 6 Dec 2015 01:13:19 +0000 (UTC) From: Garrett Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r291882 - user/ngie/make_check/share/mk Message-ID: <201512060113.tB61DJeM082742@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ngie Date: Sun Dec 6 01:13:18 2015 New Revision: 291882 URL: https://svnweb.freebsd.org/changeset/base/291882 Log: Simplify KYUAFILE == auto/yes case; rename Kyuafile.auto intermediate file to Kyuafile so make check can use it directly; use ${.TARGET} instead of hardcoding Kyuafile.auto Modified: user/ngie/make_check/share/mk/suite.test.mk Modified: user/ngie/make_check/share/mk/suite.test.mk ============================================================================== --- user/ngie/make_check/share/mk/suite.test.mk Sun Dec 6 00:58:09 2015 (r291881) +++ user/ngie/make_check/share/mk/suite.test.mk Sun Dec 6 01:13:18 2015 (r291882) @@ -56,24 +56,20 @@ KYUAFILE?= auto # hierarchy specified by this variable. KYUA_PREFIX?= /usr/local -.if ${KYUAFILE:tl} == "yes" +.if ${KYUAFILE:tl} != "no" FILES+= Kyuafile FILESDIR_Kyuafile= ${TESTSDIR} +CLEANFILES+= Kyuafile Kyuafile.tmp +.endif -CLEANFILES+= Kyuafile.auto Kyuafile.auto.tmp -.elif ${KYUAFILE:tl} == "auto" -FILES+= Kyuafile.auto -FILESDIR_Kyuafile.auto= ${TESTSDIR} -FILESNAME_Kyuafile.auto= Kyuafile - -CLEANFILES+= Kyuafile.auto Kyuafile.auto.tmp +.if ${KYUAFILE:tl} == "auto" .for _T in ${_TESTS} _TEST_METADATA.${_T}= ${TEST_METADATA} ${TEST_METADATA.${_T}} .endfor -.NOPATH: Kyuafile.auto -Kyuafile.auto: Makefile +.NOPATH: Kyuafile +Kyuafile: Makefile @{ \ echo '-- Automatically generated by bsd.test.mk.'; \ echo; \ @@ -81,15 +77,15 @@ Kyuafile.auto: Makefile echo; \ echo 'test_suite("${TESTSUITE}")'; \ echo; \ - } >Kyuafile.auto.tmp + } > ${.TARGET}.tmp .for _T in ${_TESTS} @echo '${TEST_INTERFACE.${_T}}_test_program{name="${_T}"${_TEST_METADATA.${_T}:C/$/,/:tW:C/^/, /W:C/,$//W}}' \ - >>Kyuafile.auto.tmp + >>${.TARGET}.tmp .endfor .for _T in ${TESTS_SUBDIRS:N.WAIT} - @echo "include(\"${_T}/Kyuafile\")" >>Kyuafile.auto.tmp + @echo "include(\"${_T}/Kyuafile\")" >>${.TARGET}.tmp .endfor - @mv Kyuafile.auto.tmp Kyuafile.auto + @mv ${.TARGET}.tmp ${.TARGET} .endif _kyuafile= ${DESTDIR}${TESTSDIR}/Kyuafile
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201512060113.tB61DJeM082742>