Finish update to bmake-20220724
This commit is contained in:
parent
a387bd1b6a
commit
58cd36950c
@ -7,7 +7,7 @@ SRCTOP?= ${.CURDIR:H:H}
|
|||||||
|
|
||||||
# things set by configure
|
# things set by configure
|
||||||
|
|
||||||
_MAKE_VERSION?=20220418
|
_MAKE_VERSION?=20220724
|
||||||
|
|
||||||
prefix?= /usr
|
prefix?= /usr
|
||||||
srcdir= ${SRCTOP}/contrib/bmake
|
srcdir= ${SRCTOP}/contrib/bmake
|
||||||
|
@ -2,9 +2,9 @@
|
|||||||
# See contrib/bmake/bsd.after-import.mk
|
# See contrib/bmake/bsd.after-import.mk
|
||||||
#
|
#
|
||||||
# $FreeBSD$
|
# $FreeBSD$
|
||||||
# $Id: Makefile,v 1.180 2022/04/18 21:25:37 sjg Exp $
|
# $Id: Makefile,v 1.181 2022/06/13 00:18:20 sjg Exp $
|
||||||
#
|
#
|
||||||
# $NetBSD: Makefile,v 1.312 2022/04/18 15:06:28 rillig Exp $
|
# $NetBSD: Makefile,v 1.318 2022/06/10 21:28:50 rillig Exp $
|
||||||
#
|
#
|
||||||
# Unit tests for make(1)
|
# Unit tests for make(1)
|
||||||
#
|
#
|
||||||
@ -87,7 +87,6 @@ TESTS+= cond-token-plain
|
|||||||
TESTS+= cond-token-string
|
TESTS+= cond-token-string
|
||||||
TESTS+= cond-token-var
|
TESTS+= cond-token-var
|
||||||
TESTS+= cond-undef-lint
|
TESTS+= cond-undef-lint
|
||||||
TESTS+= cond1
|
|
||||||
TESTS+= counter
|
TESTS+= counter
|
||||||
TESTS+= counter-append
|
TESTS+= counter-append
|
||||||
TESTS+= dep
|
TESTS+= dep
|
||||||
@ -172,6 +171,7 @@ TESTS+= directive-export-impl
|
|||||||
TESTS+= directive-export-gmake
|
TESTS+= directive-export-gmake
|
||||||
TESTS+= directive-export-literal
|
TESTS+= directive-export-literal
|
||||||
TESTS+= directive-for
|
TESTS+= directive-for
|
||||||
|
TESTS+= directive-for-empty
|
||||||
TESTS+= directive-for-errors
|
TESTS+= directive-for-errors
|
||||||
TESTS+= directive-for-escape
|
TESTS+= directive-for-escape
|
||||||
TESTS+= directive-for-generating-endif
|
TESTS+= directive-for-generating-endif
|
||||||
@ -443,7 +443,6 @@ TESTS+= varparse-dynamic
|
|||||||
TESTS+= varparse-errors
|
TESTS+= varparse-errors
|
||||||
TESTS+= varparse-mod
|
TESTS+= varparse-mod
|
||||||
TESTS+= varparse-undef-partial
|
TESTS+= varparse-undef-partial
|
||||||
TESTS+= varquote
|
|
||||||
|
|
||||||
# some shells have quirks
|
# some shells have quirks
|
||||||
_shell := ${.SHELL:tA:T}
|
_shell := ${.SHELL:tA:T}
|
||||||
@ -583,8 +582,10 @@ SED_CMDS.varname-dot-shell+= -e 's,\[/[^] ]*\],[(details omitted)],g'
|
|||||||
SED_CMDS.varname-empty= ${.OBJDIR .PARSEDIR .PATH .SHELL:L:@v@-e '/\\$v/d'@}
|
SED_CMDS.varname-empty= ${.OBJDIR .PARSEDIR .PATH .SHELL:L:@v@-e '/\\$v/d'@}
|
||||||
|
|
||||||
# Some tests need an additional round of postprocessing.
|
# Some tests need an additional round of postprocessing.
|
||||||
|
POSTPROC.depsrc-wait= sed -e '/^---/d' -e 's,^\(: Making 3[abc]\)[123]$$,\1,'
|
||||||
POSTPROC.deptgt-suffixes= awk '/^\#\*\*\* Suffixes/,/^never-stop/'
|
POSTPROC.deptgt-suffixes= awk '/^\#\*\*\* Suffixes/,/^never-stop/'
|
||||||
POSTPROC.gnode-submake= awk '/Input graph/, /^$$/'
|
POSTPROC.gnode-submake= awk '/Input graph/, /^$$/'
|
||||||
|
POSTPROC.varname-dot-make-mode= sed 's,^\(: Making [abc]\)[123]$$,\1,'
|
||||||
|
|
||||||
# Some tests reuse other tests, which makes them unnecessarily fragile.
|
# Some tests reuse other tests, which makes them unnecessarily fragile.
|
||||||
export-all.rawout: export.mk
|
export-all.rawout: export.mk
|
||||||
@ -728,7 +729,7 @@ MAKE_TEST_ENV+= MALLOC_CONF="junk:true" # for jemalloc 510
|
|||||||
MAKE_TEST_ENV+= TMPDIR=${TMPDIR}
|
MAKE_TEST_ENV+= TMPDIR=${TMPDIR}
|
||||||
|
|
||||||
.if ${.MAKE.OS} == "NetBSD"
|
.if ${.MAKE.OS} == "NetBSD"
|
||||||
LIMIT_RESOURCES?= ulimit -v 200000
|
LIMIT_RESOURCES?= ulimit -v 300000
|
||||||
.endif
|
.endif
|
||||||
LIMIT_RESOURCES?= :
|
LIMIT_RESOURCES?= :
|
||||||
|
|
||||||
@ -750,7 +751,7 @@ LIMIT_RESOURCES?= :
|
|||||||
echo $$status > ${.TARGET:R}.status
|
echo $$status > ${.TARGET:R}.status
|
||||||
@mv ${.TARGET}.tmp ${.TARGET}
|
@mv ${.TARGET}.tmp ${.TARGET}
|
||||||
|
|
||||||
# Postprocess the test output so that the results can be compared.
|
# Postprocess the test output to make the output platform-independent.
|
||||||
#
|
#
|
||||||
# always pretend .MAKE was called 'make'
|
# always pretend .MAKE was called 'make'
|
||||||
_SED_CMDS+= -e 's,^${TEST_MAKE:T:S,.,\\.,g}[][0-9]*:,make:,'
|
_SED_CMDS+= -e 's,^${TEST_MAKE:T:S,.,\\.,g}[][0-9]*:,make:,'
|
||||||
|
Loading…
Reference in New Issue
Block a user