Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 6 Jun 2014 17:53:05 +0000 (UTC)
From:      Julio Merino <jmmv@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r267176 - head/share/mk
Message-ID:  <201406061753.s56Hr5ni061112@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jmmv
Date: Fri Jun  6 17:53:05 2014
New Revision: 267176
URL: http://svnweb.freebsd.org/changeset/base/267176

Log:
  Add the *_TESTS_SH_SED_* functionality to atf.test.mk.
  
  This exists already in plain.test.mk and tap.test.mk and should have been
  added to atf.test.mk too when the feature was first introduced.
  
  (It is probably time to address the related TODOs but I will do that
  separately.)

Modified:
  head/share/mk/atf.test.mk

Modified: head/share/mk/atf.test.mk
==============================================================================
--- head/share/mk/atf.test.mk	Fri Jun  6 17:42:55 2014	(r267175)
+++ head/share/mk/atf.test.mk	Fri Jun  6 17:53:05 2014	(r267176)
@@ -98,10 +98,14 @@ _TESTS+= ${ATF_TESTS_SH}
 SCRIPTSDIR_${_T}= ${TESTSDIR}
 TEST_INTERFACE.${_T}= atf
 CLEANFILES+= ${_T} ${_T}.tmp
+# TODO(jmmv): It seems to me that this SED and SRC functionality should
+# exist in bsd.prog.mk along the support for SCRIPTS.  Move it there if
+# this proves to be useful within the tests.
+ATF_TESTS_SH_SED_${_T}?= # empty
 ATF_TESTS_SH_SRC_${_T}?= ${_T}.sh
 ${_T}: ${ATF_TESTS_SH_SRC_${_T}}
 	echo '#! /usr/bin/atf-sh' > ${.TARGET}.tmp
-	cat ${.ALLSRC} >> ${.TARGET}.tmp
+	cat ${.ALLSRC} | sed ${ATF_TESTS_SH_SED_${_T}} >>${.TARGET}.tmp
 	chmod +x ${.TARGET}.tmp
 	mv ${.TARGET}.tmp ${.TARGET}
 .endfor



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201406061753.s56Hr5ni061112>