From nobody Wed Feb 16 05:38:58 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 D3B2D19C7DEC; Wed, 16 Feb 2022 05:38:59 +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 4Jz6Fv09Lsz3ktN; Wed, 16 Feb 2022 05:38:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644989939; 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=cSB7z15qjH5KwjWLpYN6GEmnWUkSuQR/3klrJix2W5s=; b=GBRD8fGLZRFBLADNp0kh7a+wMa7oNwvZvYgLyQowny56Afn8lrV9GMjIstU1mu6/02Qwnq hEIH6xVved6BmgkzkYvrv+3+/sTPFaFbppPg7HH9LFPtAsyOoFVokOkH9uOFie5e+8Wl2S IjPxfTcTMg10NDkF3VvQVMMutfyFuUZrbcFNGNsIRixndufld/AeoaLlR4YKqxU7AeThi9 K+bmF+BfkIDv+nwbPDjQxR50IYzOB9X77FO0lg+CGlF9MV925/bqGsMNyEDo7EFJf6Y+yF mABHw4M6HBlHTdFqnujUqnfUOo3AeMnRF3kwVT+YE9l9nOaq0dIyj5a0rHggMw== 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 A2388109C5; Wed, 16 Feb 2022 05:38:58 +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 21G5cwFT059748; Wed, 16 Feb 2022 05:38:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21G5cw0P059747; Wed, 16 Feb 2022 05:38:58 GMT (envelope-from git) Date: Wed, 16 Feb 2022 05:38:58 GMT Message-Id: <202202160538.21G5cw0P059747@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Simon J. Gerraty" Subject: git: 22ade366be0b - stable/13 - Update to bmake-20220204 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 22ade366be0ba0fcc01a79ca88683683897b9d59 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644989939; 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=cSB7z15qjH5KwjWLpYN6GEmnWUkSuQR/3klrJix2W5s=; b=xKU7PmprLAp3KPKjxz1E4vTgVPo/RZjaaPA8b/fEd0nbEE4GRCaIHX9JafPyPKo1NAu/OQ DJirk/o19IIatl2hMjFVIWsFuYCgpNCckL4hxXj9dVRcieIDMx9o184ZOgAfKnKCq8NeCJ s15ZHriJAACgpFB65XoHmc8+u/akTk8mD2ye/dAIGbWRKAiMYnWarN2ve1uCzQFJzSV0a6 9b2rjcMoV1Ft0i8lafQD2t+uchjrOAmYVlSqHXCakylHukSp0z0YFnCv1ljOFQEtewB+0d F3RWUpG4VqxBOIpAxtJwF24uhzMxZIOgdgcSsqMbR+QcohQgvjvPDaYDmZ3rAQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644989939; a=rsa-sha256; cv=none; b=pp3bhKUZoBaVDYsLIeRcj/6bW+eHcD06Ay8u3/Q9JbAfHdZU6QtvsQCz95keR1tWnjeT+E 8Ng4QCG9qf1vzTbFAMKx21fhH2sfEY2cvwjFRE94rE/K0hl2pwwzuEUNBBgdaQ9gWpOrtu OjWqA86tFUtq7SIyKU2c5cUQlpap6Zq3F/gyAhD5DQFFmokTswtGFLduPUD2we4J4e6nmm wHDvfiUdRImIPxTH1PgwViQeEzrhwn5yWawtIVOTDvRAGjBjK0n6rkSkUNRvbneDet2Umd 4rKXmVrbkyOnCXIi02GyggNe8vEkgvDx8joyS3h1fhsSv3A4UYQ5uklFkageLg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=22ade366be0ba0fcc01a79ca88683683897b9d59 commit 22ade366be0ba0fcc01a79ca88683683897b9d59 Author: Simon J. Gerraty AuthorDate: 2022-02-05 20:29:10 +0000 Commit: Simon J. Gerraty CommitDate: 2022-02-16 05:37:08 +0000 Update to bmake-20220204 (cherry picked from commit 6598559fdf0c6342b6c30229430c739c42dc9941) --- usr.bin/bmake/Makefile.config | 2 +- usr.bin/bmake/unit-tests/Makefile | 30 ++++++++++++++++++------------ 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/usr.bin/bmake/Makefile.config b/usr.bin/bmake/Makefile.config index 5433adefc218..ea46f5795b27 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?=20211212 +_MAKE_VERSION?=20220204 prefix?= /usr srcdir= ${SRCTOP}/contrib/bmake diff --git a/usr.bin/bmake/unit-tests/Makefile b/usr.bin/bmake/unit-tests/Makefile index c03eab3d6a63..348fc0614c1b 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.164 2021/12/12 22:50:00 sjg Exp $ +# $Id: Makefile,v 1.171 2022/01/28 21:33:18 sjg Exp $ # -# $NetBSD: Makefile,v 1.288 2021/12/12 22:16:48 rillig Exp $ +# $NetBSD: Makefile,v 1.302 2022/01/27 21:50:50 sjg Exp $ # # Unit tests for make(1) # @@ -95,8 +95,10 @@ TESTS+= dep-colon TESTS+= dep-colon-bug-cross-file TESTS+= dep-double-colon TESTS+= dep-double-colon-indep +TESTS+= dep-duplicate TESTS+= dep-exclam TESTS+= dep-none +TESTS+= dep-op-missing TESTS+= dep-percent TESTS+= dep-var TESTS+= dep-wildcards @@ -193,7 +195,6 @@ TESTS+= directive-warning TESTS+= dollar TESTS+= doterror TESTS+= dotwait -TESTS+= envfirst TESTS+= error TESTS+= # escape # broken by reverting POSIX changes TESTS+= export @@ -220,8 +221,6 @@ TESTS+= meta-cmd-cmp TESTS+= moderrs TESTS+= modmatch TESTS+= modmisc -TESTS+= modts -TESTS+= modword .if ${.MAKE.UID} > 0 TESTS+= objdir-writable .endif @@ -277,10 +276,12 @@ TESTS+= opt-touch-jobs TESTS+= opt-tracefile TESTS+= opt-var-expanded TESTS+= opt-var-literal +TESTS+= opt-version TESTS+= opt-warnings-as-errors TESTS+= opt-where-am-i TESTS+= opt-x-reduce-exported TESTS+= order +TESTS+= parse TESTS+= parse-var TESTS+= phony-end TESTS+= posix @@ -323,12 +324,12 @@ TESTS+= ternary TESTS+= unexport TESTS+= unexport-env TESTS+= use-inference -TESTS+= var-class -TESTS+= var-class-cmdline -TESTS+= var-class-env -TESTS+= var-class-global -TESTS+= var-class-local -TESTS+= var-class-local-legacy +TESTS+= var-scope +TESTS+= var-scope-cmdline +TESTS+= var-scope-env +TESTS+= var-scope-global +TESTS+= var-scope-local +TESTS+= var-scope-local-legacy TESTS+= var-eval-short TESTS+= var-op TESTS+= var-op-append @@ -344,6 +345,7 @@ TESTS+= varfind TESTS+= varmisc TESTS+= varmod TESTS+= varmod-assign +TESTS+= varmod-assign-shell TESTS+= varmod-defined TESTS+= varmod-edge TESTS+= varmod-exclam-shell @@ -502,7 +504,6 @@ ENV.varname-vpath+= VPATH=varname-vpath.dir:varname-vpath.dir2 # If possible, write ".MAKEFLAGS: -dv" in the test .mk file instead of # settings FLAGS.test=-dv here, since that is closer to the test code. FLAGS.cond-func-make= via-cmdline -FLAGS.directive-ifmake= first second FLAGS.doterror= # none, especially not -k FLAGS.jobs-error-indirect= # none, especially not -k FLAGS.jobs-error-nested= # none, especially not -k @@ -535,6 +536,7 @@ SED_CMDS.opt-chdir= -e 's,\(nonexistent\).[1-9][0-9]*,\1,' \ SED_CMDS.opt-debug-graph1= ${STD_SED_CMDS.dg1} SED_CMDS.opt-debug-graph2= ${STD_SED_CMDS.dg2} SED_CMDS.opt-debug-graph3= ${STD_SED_CMDS.dg3} +SED_CMDS.opt-debug-hash= -e 's,\(numEntries\)=[1-9][0-9],\1=,' SED_CMDS.opt-debug-jobs= -e 's,([0-9][0-9]*),(),' SED_CMDS.opt-debug-jobs+= -e 's,pid [0-9][0-9]*,pid ,' SED_CMDS.opt-debug-jobs+= -e 's,Process [0-9][0-9]*,Process ,' @@ -545,6 +547,7 @@ SED_CMDS.opt-debug-jobs+= -e 's,^\(.Command: \) -q,\1,' SED_CMDS.opt-debug-lint+= ${STD_SED_CMDS.regex} SED_CMDS.opt-jobs-no-action= ${STD_SED_CMDS.hide-from-output} SED_CMDS.opt-no-action-runflags= ${STD_SED_CMDS.hide-from-output} +SED_CMDS.opt-where-am-i= -e '/usr.obj/d' # For Compat_RunCommand, useShell == false. SED_CMDS.sh-dots= -e 's,^.*\.\.\.:.*,,' # For Compat_RunCommand, useShell == true. @@ -740,6 +743,9 @@ _SED_CMDS+= -e 's,${TEST_MAKE:T:S,.,\\.,g}[][0-9]* warning,make warning,' _SED_CMDS+= -e 's,^usage: ${TEST_MAKE:T:S,.,\\.,g} ,usage: make ,' # replace anything after 'stopped in' with unit-tests _SED_CMDS+= -e '/stopped/s, /.*, unit-tests,' +# Allow the test files to be placed anywhere. +_SED_CMDS+= -e 's,\(\.PARSEDIR}\) = `'"/[^']*'"',\1 = ,' +_SED_CMDS+= -e 's,\(\.INCLUDEDFROMDIR}\) = `'"/[^']*'"',\1 = ,' _SED_CMDS+= -e 's,${TMPDIR},TMPDIR,g' # canonicalize ${.OBJDIR} and ${.CURDIR} .if ${.OBJDIR} != ${.CURDIR}