d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplify Kyuafile generation logic with KYUAFILE == auto and

Browse Source 
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
This commit is contained in:
Enji Cooper 2015-12-20 05:38:06 +00:00
parent c4aa7d7701
commit c4835f11d0
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
share/mk/suite.test.mk
View File

@ -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