From nobody Sun Sep 1 06:29:34 2024 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 4WxMRy5xzmz5Tcq2; Sun, 01 Sep 2024 06:29: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WxMRy550nz4gGr; Sun, 1 Sep 2024 06:29:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725172174; 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=xg0G7/2objscSRqXNkyf4Mio1lcKcMldUkK9Pa7XuUc=; b=LWifh13xiWdFSe9cYA72JC7xVizsXD8Jd9My88ZXOOZ7dzRFBC/c/GIn2Pw+V8tf3s6B7v jDFJ3/fNglQCoXO8MCxozPiijKNRhWJ+Wt7lnZR+bAZJYrGWDsu2q5vSlDuJ6XCa55U6b/ QRgR+/w66QJkOB6VcPIHMp51k1atF+tZJyJVPKPxukxWwUdqQWU9DW72quKfcmgLvmze1C wdMNhPubY4lBsyCIoHxhEkZzB/O5NTgMOxw+HYoVLxpxesT0R6Iu/MBru80tVQ/meI3fk2 3FtoqSTluBIpZCGQY93hESwx2Fz7ZZlGnmg8nzu88H2v2qEAoFzfU1LxIRHXtA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725172174; a=rsa-sha256; cv=none; b=xHhtC+u7bTva2T7dT9CPu/EYSCgSTTbKqvQLECP6n/omc4bvhCuHKYycmM6DiO/7ZPj89N 8gQCb/qemqZHgtxshy/HBQXu3OKQ62L9arUDE2csjzcEkE6Z7EZ16K63gFx6+Fes2tN//3 zQJ+Rzef1iDFxe1XGh8pK8opneIRXU3Labh2zJDXge96w9QoyqeR8biCG0KexEdPs6b9cV TAPQpll/q/ESUfENjOwyDj1qQ/HFOVRrqmL6eNu8iWOJRBIv8Ypm9da0TX3VY+ZXCRcliM R/bwkJq5Qu1L4uOMVyM1MqnFRgdr3NXRABkLa9Q+EaYqv1qKi2DMzjNcN08Vpg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725172174; 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=xg0G7/2objscSRqXNkyf4Mio1lcKcMldUkK9Pa7XuUc=; b=DtpCtEKXTl+YrT5nVloPChR2V6Z0kx01V349IqVz7dFmPoEcux8n563W9YqEeLoPmFbo/I sy0v0RTReI31lo/rNrqijg2/Vu1DRzYd1AHMJsnSn6y9jbPYa0BYoyg9qEGVNcHIg+IEVq Kchpr/1GsT94axbbCh+GxTLclx7uVRiGw4I/9T6ybItJILg+p2DnPjS7Y8WDxC/njs5HXi pwbDHftbdrbeXC5yfS9cNzOVrcrcElHbYS0USypxdY8IsPku7nW5TBZQCKz5TayrEhrDKi lObiWcSwlRec7DAXzHPxW2sZ9OZbgwsuFuS3yKkT7mRYOYENrFWvHBne/qgtAg== 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 4WxMRy4hvlzHwV; Sun, 1 Sep 2024 06:29:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4816TY77021308; Sun, 1 Sep 2024 06:29:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4816TYHE021305; Sun, 1 Sep 2024 06:29:34 GMT (envelope-from git) Date: Sun, 1 Sep 2024 06:29:34 GMT Message-Id: <202409010629.4816TYHE021305@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: 2d203f534bae - stable/13 - bmake/unit-tests/Makefile use _shell 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 2d203f534baef0568989555ebd26278134ef4c6b Auto-Submitted: auto-generated The branch stable/13 has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=2d203f534baef0568989555ebd26278134ef4c6b commit 2d203f534baef0568989555ebd26278134ef4c6b Author: Simon J. Gerraty AuthorDate: 2024-09-01 06:29:19 +0000 Commit: Simon J. Gerraty CommitDate: 2024-09-01 06:29:19 +0000 bmake/unit-tests/Makefile use _shell Set _shell like later versions of bmake so that .SHELL does not appear in conditionals. This avoids errors when an older version of bmake parses this makefile such as when doing src upgrade from stable/12 or older. Direct commit to stable/13 since this is the only branch where this issue arrises. PR: 281151 --- usr.bin/bmake/unit-tests/Makefile | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/usr.bin/bmake/unit-tests/Makefile b/usr.bin/bmake/unit-tests/Makefile index 96bde713ba38..2b20de2498eb 100644 --- a/usr.bin/bmake/unit-tests/Makefile +++ b/usr.bin/bmake/unit-tests/Makefile @@ -441,14 +441,15 @@ TESTS+= varparse-mod TESTS+= varparse-undef-partial TESTS+= varquote -# for now at least -.if ${.SHELL:T} == "ksh" +# some shells have quirks +_shell := ${.SHELL:U/bin/sh:tA:T} +.if ${_shell} == "ksh" BROKEN_TESTS+= sh-flags .endif .if ${.MAKE.OS:NDarwin} == "" BROKEN_TESTS+= shell-ksh .endif -.if ${.MAKE.OS} == "Linux" && ${.SHELL:tA:T} != "bash" +.if ${.MAKE.OS} == "Linux" && ${_shell} != "bash" .if exists(/etc/os-release) distro!= . /etc/os-release && echo $$NAME .endif @@ -465,7 +466,7 @@ BROKEN_TESTS+= \ varmod-localtime \ varmod-to-separator \ -.if ${.SHELL:T} == "bash" +.if ${_shell} == "bash" BROKEN_TESTS+= job-output-null .else BROKEN_TESTS+= \ @@ -771,7 +772,7 @@ _SED_CMDS+= -e 's,${UNIT_TESTS:S,.,\\.,g}/,,g' .if ${.MAKE.OS:N*BSD} != "" _SED_CMDS+= -e 's,\(Error code\) 255,\1 1,' .endif -.if ${.SHELL:T} == "ksh" +.if ${_shell} == "ksh" _SED_CMDS+= -e '/^set [+-]v/d' .endif