From owner-svn-src-stable-10@FreeBSD.ORG  Tue Dec 30 20:46:03 2014
Return-Path: <owner-svn-src-stable-10@FreeBSD.ORG>
Delivered-To: svn-src-stable-10@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 75F8FB5F;
 Tue, 30 Dec 2014 20:46:03 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::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 47684225D;
 Tue, 30 Dec 2014 20:46:03 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBUKk3jg049047;
 Tue, 30 Dec 2014 20:46:03 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBUKk2B3049040;
 Tue, 30 Dec 2014 20:46:02 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201412302046.sBUKk2B3049040@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org
 using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Tue, 30 Dec 2014 20:46:02 +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: r276423 - 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-stable-10@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for only the 10-stable src tree
 <svn-src-stable-10.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-10/>
List-Post: <mailto:svn-src-stable-10@freebsd.org>
List-Help: <mailto:svn-src-stable-10-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 30 Dec 2014 20:46:03 -0000

Author: ngie
Date: Tue Dec 30 20:46:01 2014
New Revision: 276423
URL: https://svnweb.freebsd.org/changeset/base/276423

Log:
  MFC r274077:
  
    As an optimization (in simple, well used cases) only call cat ${.ALLSRC} when
    generating files from various sources instead of calling cat ${.ALLSRC} | sed
  
    The perl case was skipped because it's not being used in the tree at this time

Modified:
  stable/10/share/mk/atf.test.mk
  stable/10/share/mk/plain.test.mk
  stable/10/share/mk/tap.test.mk
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/share/mk/atf.test.mk
==============================================================================
--- stable/10/share/mk/atf.test.mk	Tue Dec 30 20:44:05 2014	(r276422)
+++ stable/10/share/mk/atf.test.mk	Tue Dec 30 20:46:01 2014	(r276423)
@@ -105,8 +105,12 @@ ATF_TESTS_SH_SED_${_T}?= # empty
 ATF_TESTS_SH_SRC_${_T}?= ${_T}.sh
 ${_T}: ${ATF_TESTS_SH_SRC_${_T}}
 	echo '#! /usr/libexec/atf-sh' > ${.TARGET}.tmp
+.if empty(ATF_TESTS_SH_SED_${_T})
+	cat ${.ALLSRC:N*Makefile*} >>${.TARGET}.tmp
+.else
 	cat ${.ALLSRC:N*Makefile*} \
 	    | sed ${ATF_TESTS_SH_SED_${_T}} >>${.TARGET}.tmp
+.endif
 	chmod +x ${.TARGET}.tmp
 	mv ${.TARGET}.tmp ${.TARGET}
 .endfor

Modified: stable/10/share/mk/plain.test.mk
==============================================================================
--- stable/10/share/mk/plain.test.mk	Tue Dec 30 20:44:05 2014	(r276422)
+++ stable/10/share/mk/plain.test.mk	Tue Dec 30 20:46:01 2014	(r276423)
@@ -57,8 +57,12 @@ CLEANFILES+= ${_T} ${_T}.tmp
 PLAIN_TESTS_SH_SED_${_T}?= # empty
 PLAIN_TESTS_SH_SRC_${_T}?= ${_T}.sh
 ${_T}: ${PLAIN_TESTS_SH_SRC_${_T}}
+.if empty(PLAIN_TESTS_SH_SED_${_T})
+	cat ${.ALLSRC:N*Makefile*} >${.TARGET}.tmp
+.else
 	cat ${.ALLSRC:N*Makefile*} \
 	    | sed ${PLAIN_TESTS_SH_SED_${_T}} >${.TARGET}.tmp
+.endif
 	chmod +x ${.TARGET}.tmp
 	mv ${.TARGET}.tmp ${.TARGET}
 .endfor

Modified: stable/10/share/mk/tap.test.mk
==============================================================================
--- stable/10/share/mk/tap.test.mk	Tue Dec 30 20:44:05 2014	(r276422)
+++ stable/10/share/mk/tap.test.mk	Tue Dec 30 20:46:01 2014	(r276423)
@@ -86,7 +86,11 @@ CLEANFILES+= ${_T} ${_T}.tmp
 TAP_TESTS_SH_SED_${_T}?= # empty
 TAP_TESTS_SH_SRC_${_T}?= ${_T}.sh
 ${_T}: ${TAP_TESTS_SH_SRC_${_T}}
+.if empty(TAP_TESTS_SH_SED_${_T})
+	cat ${.ALLSRC} >${.TARGET}.tmp
+.else
 	cat ${.ALLSRC} | sed ${TAP_TESTS_SH_SED_${_T}} >${.TARGET}.tmp
+.endif
 	chmod +x ${.TARGET}.tmp
 	mv ${.TARGET}.tmp ${.TARGET}
 .endfor