diff options
| author | Simon J. Gerraty <sjg@FreeBSD.org> | 2022-07-26 18:06:27 +0000 |
|---|---|---|
| committer | Simon J. Gerraty <sjg@FreeBSD.org> | 2022-07-26 18:06:27 +0000 |
| commit | 58cd36950cd9d25b680a92a3c275b3bf18a7d407 (patch) | |
| tree | 24822fd615bdcfffaba1dcaf373fa9253d277444 /usr.bin | |
| parent | a387bd1b6a0e18d7abafcbb5ae1870be0604ff15 (diff) | |
| download | src-58cd36950cd9d25b680a92a3c275b3bf18a7d407.tar.gz src-58cd36950cd9d25b680a92a3c275b3bf18a7d407.zip | |
Finish update to bmake-20220724
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/bmake/Makefile.config | 2 | ||||
| -rw-r--r-- | usr.bin/bmake/unit-tests/Makefile | 13 |
2 files changed, 8 insertions, 7 deletions
diff --git a/usr.bin/bmake/Makefile.config b/usr.bin/bmake/Makefile.config index ac183b03726a..fa48f4a88b00 100644 --- a/usr.bin/bmake/Makefile.config +++ b/usr.bin/bmake/Makefile.config @@ -7,7 +7,7 @@ SRCTOP?= ${.CURDIR:H:H} # things set by configure -_MAKE_VERSION?=20220418 +_MAKE_VERSION?=20220724 prefix?= /usr srcdir= ${SRCTOP}/contrib/bmake diff --git a/usr.bin/bmake/unit-tests/Makefile b/usr.bin/bmake/unit-tests/Makefile index aaa69bf29eb3..13967ae888a8 100644 --- a/usr.bin/bmake/unit-tests/Makefile +++ b/usr.bin/bmake/unit-tests/Makefile @@ -2,9 +2,9 @@ # See contrib/bmake/bsd.after-import.mk # # $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) # @@ -87,7 +87,6 @@ TESTS+= cond-token-plain TESTS+= cond-token-string TESTS+= cond-token-var TESTS+= cond-undef-lint -TESTS+= cond1 TESTS+= counter TESTS+= counter-append TESTS+= dep @@ -172,6 +171,7 @@ TESTS+= directive-export-impl TESTS+= directive-export-gmake TESTS+= directive-export-literal TESTS+= directive-for +TESTS+= directive-for-empty TESTS+= directive-for-errors TESTS+= directive-for-escape TESTS+= directive-for-generating-endif @@ -443,7 +443,6 @@ TESTS+= varparse-dynamic TESTS+= varparse-errors TESTS+= varparse-mod TESTS+= varparse-undef-partial -TESTS+= varquote # some shells have quirks _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'@} # 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.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. export-all.rawout: export.mk @@ -728,7 +729,7 @@ MAKE_TEST_ENV+= MALLOC_CONF="junk:true" # for jemalloc 510 MAKE_TEST_ENV+= TMPDIR=${TMPDIR} .if ${.MAKE.OS} == "NetBSD" -LIMIT_RESOURCES?= ulimit -v 200000 +LIMIT_RESOURCES?= ulimit -v 300000 .endif LIMIT_RESOURCES?= : @@ -750,7 +751,7 @@ LIMIT_RESOURCES?= : echo $$status > ${.TARGET:R}.status @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' _SED_CMDS+= -e 's,^${TEST_MAKE:T:S,.,\\.,g}[][0-9]*:,make:,' |