diff options
| author | ngie <ngie@FreeBSD.org> | 2015-12-20 05:38:06 +0000 |
|---|---|---|
| committer | ngie <ngie@FreeBSD.org> | 2015-12-20 05:38:06 +0000 |
| commit | a182d9560897abb52400b4d13996222fea74db40 (patch) | |
| tree | 76bb024c69e1779b7922f1412120e7b722d1672b /share | |
| parent | 1d719b920dd2cf53f0687a9b8be85f115e9c2e35 (diff) | |
| download | FreeBSD-src-a182d9560897abb52400b4d13996222fea74db40.zip FreeBSD-src-a182d9560897abb52400b4d13996222fea74db40.tar.gz | |
Simplify Kyuafile generation logic with KYUAFILE == auto and
related complexity with variables
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D4406 (part of a larger diff)
Reviewed by: emaste, Evan Cramer <eccramer@gmail.com>
Sponsored by: EMC / Isilon Storage Division
Diffstat (limited to 'share')
| -rw-r--r-- | share/mk/suite.test.mk | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/share/mk/suite.test.mk b/share/mk/suite.test.mk index 579ef7c..df6beb9 100644 --- a/share/mk/suite.test.mk +++ b/share/mk/suite.test.mk @@ -52,24 +52,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} +.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" +CLEANFILES+= Kyuafile Kyuafile.auto.tmp +.endif .for _T in ${_TESTS} _TEST_METADATA.${_T}= ${TEST_METADATA} ${TEST_METADATA.${_T}} .endfor -.NOPATH: Kyuafile.auto -Kyuafile.auto: Makefile +Kyuafile: Makefile @{ \ echo '-- Automatically generated by bsd.test.mk.'; \ echo; \ @@ -77,15 +73,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 KYUA?= ${KYUA_PREFIX}/bin/kyua |
