From nobody Tue Jul 26 18:06:33 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4LslGf2JKmz4Wht6; Tue, 26 Jul 2022 18:06:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LslGf1mLDz3qbx; Tue, 26 Jul 2022 18:06:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658858794; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mW3W6Y9jTQA83HC4z0y7KjPknFnvUFm09jmOnBGEdX8=; b=Ea38/8M5rUZ+gTAph3tcKPzDsTo3II36lAs1YmklbVCi8hS/eYbH3XYDsHJGqfHKE2Ifd9 BCYcNq2FRI0bP3XLEe7FRfhZUfa4XtQHOCJSySH7j08MhGx90CIc5QOpQQccC9dnTqw0n3 XSUAz0FsKypfTmnBLfHzZSvt65SaQDhN8lgD+/9gxjiT7Aymb75etQji3Pa4LWnbCBRTCO RLpU/yFAsUGxcebrVssD6yQ1k47mAm0CZ1E2VWglB8xQ+qiuAsHEmSrbcFo4YWkexoLybZ oH1nAwuXIfN7RDLyUEjfpEK5ItvQKSqIdAuEW+aOTLhJGkCHsICIKJPIpuVF/Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4LslGf0pfGzmVT; Tue, 26 Jul 2022 18:06:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 26QI6YXA010746; Tue, 26 Jul 2022 18:06:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26QI6XuT010745; Tue, 26 Jul 2022 18:06:33 GMT (envelope-from git) Date: Tue, 26 Jul 2022 18:06:33 GMT Message-Id: <202207261806.26QI6XuT010745@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Simon J. Gerraty" Subject: git: 58cd36950cd9 - main - Finish update to bmake-20220724 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 58cd36950cd9d25b680a92a3c275b3bf18a7d407 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658858794; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mW3W6Y9jTQA83HC4z0y7KjPknFnvUFm09jmOnBGEdX8=; b=OFxtckvJandSwd6C49SwjzH9VgAjIf5kqBf+fLdlUbRT/IbtOjCIjDosc94eNM9luocn/z Wd55t0uvOkdaMcQnWE9pVBMRwpbJTig+thVF3p9PSER989uw2cl4/7OwAh8Z6jI38ic3Sz bO2A+7yiZZCeLadZnQPUT98PEK5CjuirdZh5p3B5j6UzGayxG0XhPjIT7yLIqMz7jIWgV4 /g0KL+tS47gaQ43EubLuBVF5zNShnWWhf/g9iyAPKXyQFEuekT+Ibogll5mhClPa3Lp2nz SKjFXY9SSxviqD3Y0FifW7YC9qK9Cs4wiNkCnmQK4X+d0wzF8WAgYWN+LXFFvg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658858794; a=rsa-sha256; cv=none; b=tyyHJg3dL/M2Ta0Y0Skt0nCbrUQmPhMGpVoS6paN38Efz5Q3wsmENkX+9F6qbO5GEHhFIW tRbJmUtQKidBoCmpOTPSu+OL+kVD+U9Zuwc+wQn423sw/FbMuE/USWCj//xv/e/uln9EGs iFr9ff6ruaN3J5hPSxBResj7ajZzlzBCHzvjcqWgF8JLPixV3K/oaWMpfXdJNwKd/RzI8W Mv7xYD/MshCMk4oUtWQBY0kNL8x4L81ymniYlFprDSTadG1ZMqAymvipcPrsxhlfG3rRgW 1DgYrfREzDrWXBvfSaLFdTZLzUUQFIJ4HebBa+moWefAqC48NZOE/iGb/9owCA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=58cd36950cd9d25b680a92a3c275b3bf18a7d407 commit 58cd36950cd9d25b680a92a3c275b3bf18a7d407 Author: Simon J. Gerraty AuthorDate: 2022-07-26 18:06:27 +0000 Commit: Simon J. Gerraty CommitDate: 2022-07-26 18:06:27 +0000 Finish update to bmake-20220724 --- usr.bin/bmake/Makefile.config | 2 +- 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:,'