diff options
| author | sjg <sjg@FreeBSD.org> | 2013-08-02 06:25:28 +0000 |
|---|---|---|
| committer | sjg <sjg@FreeBSD.org> | 2013-08-02 06:25:28 +0000 |
| commit | ff765cb371f120bb1d6e648a2418a7c9e3f223b2 (patch) | |
| tree | 8ceaf694b47a0d2b1022393bf58a564bda1b20a2 /contrib/bmake/unit-tests | |
| parent | 1c55a6beb9a550795753418366eee2961aae82db (diff) | |
| download | FreeBSD-src-ff765cb371f120bb1d6e648a2418a7c9e3f223b2.zip FreeBSD-src-ff765cb371f120bb1d6e648a2418a7c9e3f223b2.tar.gz | |
Merge bmake-20130730
Main feature of interest is .MAKE.JOB.PREFIX=
to suppress --- job --- tokens.
Diffstat (limited to 'contrib/bmake/unit-tests')
| -rw-r--r-- | contrib/bmake/unit-tests/Makefile.in | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/contrib/bmake/unit-tests/Makefile.in b/contrib/bmake/unit-tests/Makefile.in index bfd29b2..78ca92f 100644 --- a/contrib/bmake/unit-tests/Makefile.in +++ b/contrib/bmake/unit-tests/Makefile.in @@ -1,6 +1,6 @@ -# $Id: Makefile.in,v 1.42 2013/03/23 02:31:13 sjg Exp $ +# $Id: Makefile.in,v 1.43 2013/07/16 21:14:30 sjg Exp $ # -# $NetBSD: Makefile,v 1.36 2013/03/22 16:36:46 sjg Exp $ +# $NetBSD: Makefile,v 1.37 2013/07/16 19:59:28 sjg Exp $ # # Unit tests for make(1) # The main targets are: @@ -89,7 +89,7 @@ test: @echo "${TEST_MAKE} -f ${MAKEFILE} > ${.TARGET}.out 2>&1" @cd ${.OBJDIR} && ${TEST_MAKE} -f ${MAKEFILE} 2>&1 | \ ${TOOL_TR} -d '\015' | \ - ${TOOL_SED} -e 's,^${TEST_MAKE:T:C/\./\\\./g}:,make:,' \ + ${TOOL_SED} -e 's,^${TEST_MAKE:T:C/\./\\\./g}[^:]*:,make:,' \ -e '/stopped/s, /.*, unit-tests,' \ -e 's,${.CURDIR:C/\./\\\./g}/,,g' \ -e 's,${UNIT_TESTS:C/\./\\\./g}/,,g' > ${.TARGET}.out || { \ |
