svn commit: r292768 - stable/10/share/mk

[Garrett Cooper]

Author: ngie
Date: Sun Dec 27 11:04:11 2015
New Revision: 292768
URL: https://svnweb.freebsd.org/changeset/base/292768

Log:
  MFC r292500,r292501,r292504,r292509:
  
  r292500:
  
  Simplify Kyuafile generation logic with KYUAFILE == auto and
  related complexity with variables
  
  Differential Revision: https://reviews.freebsd.org/D4406 (part of a larger diff)
  Reviewed by: emaste, Evan Cramer <eccramer at gmail.com>
  Sponsored by: EMC / Isilon Storage Division
  
  r292501:
  
  Fix typo in r292500 by adding missing conditional statement
  
  Pointyhat to: ngie
  Differential Revision: https://reviews.freebsd.org/D4406 (part of a larger diff)
  Sponsored by: EMC / Isilon Storage Division
  
  r292504:
  
  Deal with another hardcoded reference to Kyuafile in the KYUAFILE == auto
  case
  
  Differential Revision: https://reviews.freebsd.org/D4406 (part of a larger diff)
  Reviewed by: emaste, Evan Cramer <eccramer at gmail.com>
  Sponsored by: EMC / Isilon Storage Division
  
  r292509:
  
  Clean up Kyuafile.tmp, not Kyuafile.auto.tmp
  
  Differential Revision: https://reviews.freebsd.org/D4406 (part of a larger diff)
  Reviewed by: emaste, Evan Cramer <eccramer at gmail.com>
  Sponsored by: EMC / Isilon Storage Division

Modified:
  stable/10/share/mk/suite.test.mk
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/share/mk/suite.test.mk
==============================================================================
--- stable/10/share/mk/suite.test.mk	Sun Dec 27 07:50:11 2015	(r292767)
+++ stable/10/share/mk/suite.test.mk	Sun Dec 27 11:04:11 2015	(r292768)
@@ -45,20 +45,17 @@ 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.tmp
+.endif
 
-.NOPATH: Kyuafile.auto
-Kyuafile.auto: Makefile
+.if ${KYUAFILE:tl} == "auto"
+Kyuafile: Makefile
 	@{ \
 	    echo '-- Automatically generated by bsd.test.mk.'; \
 	    echo; \
@@ -66,20 +63,20 @@ Kyuafile.auto: Makefile
 	    echo; \
 	    echo 'test_suite("${TESTSUITE}")'; \
             echo; \
-	} >Kyuafile.auto.tmp
+	} > ${.TARGET}.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
+	    >>${.TARGET}.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
+	@echo "include(\"${_T}/${.TARGET}\")" >>${.TARGET}.tmp
 .endfor
-	@mv Kyuafile.auto.tmp Kyuafile.auto
+	@mv ${.TARGET}.tmp ${.TARGET}
 .endif
 
 KYUA?= ${KYUA_PREFIX}/bin/kyua