From nobody Wed Aug 24 18:22:24 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 4MCZFX4fynz4ZXDf; Wed, 24 Aug 2022 18:22:24 +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 4MCZFX2czdz3KQd; Wed, 24 Aug 2022 18:22:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661365344; 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=kbQXv8k7t9PFHuch3ovfFFceKK89wbZDT0TDSrerb3A=; b=K/iExYNrMQDOn07pG72MJRAgNJQeA8xFARGHdV22z2PU9/Xs5TL/lo1iHadyW9H9p9DCgn VuCTiP3ihvy+UaMFLD4r3dgby3LDhvQN/7ngdfpzI+a97Xu5KKLlQM6Y8xeADRPlkhs9e5 VseQJCGk5OnYmJrPT/uea1Xu4gebm2xEps3Wp9UkrhaO+AVDpWbGWzhaZALUSa2nX5Kx4E F88SgtH4F2j3/eqHy7NkJwKVT8MpPtwUlCoqsSPPOj1TdlKKNE2U7xnIEfIR0tlbxTeS9i 4HPKfX914COQ4Uy42oTv0spHHzgIH2CHzj5+ZfkhQscem5njSKjEFYLmS0iQMA== 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 4MCZFX1hcyzJGC; Wed, 24 Aug 2022 18:22:24 +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 27OIMOYF083729; Wed, 24 Aug 2022 18:22:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27OIMOTG083728; Wed, 24 Aug 2022 18:22:24 GMT (envelope-from git) Date: Wed, 24 Aug 2022 18:22:24 GMT Message-Id: <202208241822.27OIMOTG083728@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Piotr Pawel Stefaniak Subject: git: ead0fe475c5e - stable/13 - sh: nullify ENV in tests 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: pstef X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: ead0fe475c5e30a94e01cead919a2f1e4bc38c3b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661365344; 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=kbQXv8k7t9PFHuch3ovfFFceKK89wbZDT0TDSrerb3A=; b=kxHMDcQjrkYSK53ej22s+qQu+riLfhgjjGvEPSXRyotzUdPNVgTEcUJ/rEkA/rP8bCKjzc 3y/3UPiaYwK159ZwbNXRXj723FLj2iZ25dFQigKAi4AkRE/PwWkwpXHc5uKmfPCAsaRzic B/s9yiXs35K5vkixduBZ32ssf+7mVRlhnPso5JVJguos3GXLkJ+gSNxgi7+c+A/gIbZZQY LLQiO1HZ0V4lijyYZNDmY4YT8iNEFunc6QW5vgCkjA1sTo5c+a4nS8iH4qHEXfMJdyBW/s g4aXAaS+Ktph7N+pJkKMAXU0PeqRxi2+ip80fCRVVDhL1R8VLQS5ztyu4C7kXw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1661365344; a=rsa-sha256; cv=none; b=m26zHDfx5GkxNHP+TJBliPpXCbMdZf/Xd+/TiUmThww5yQzh26y14a+JRLvDfMfZ6KeAYH 3PUkBScFLW3bkb8oCa7gmbGWth/Ud+J66n1vLYbNC6fofbT1UdLboAeCt6KCFJPfz8q6u8 LjYwbiLnmTee+AzVNNvTg2juEGuCiL0k+caRuTSDpQfPfS2YZNXoVkIByiDCjF/GxnB5Pd 2pY8oJQJDHm0qZdjZ3hy5T1h/Oj3OeS1sKzjGKwQ6M8mO4nKlV9DnOYOrA/4iG23/O4h7s FQVIRI7Ab8+/sGgfJ9spicrgIUImIrVutAlX0imP7P19/iShrc24TmHQStiskw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by pstef: URL: https://cgit.FreeBSD.org/src/commit/?id=ead0fe475c5e30a94e01cead919a2f1e4bc38c3b commit ead0fe475c5e30a94e01cead919a2f1e4bc38c3b Author: Piotr Pawel Stefaniak AuthorDate: 2022-08-20 10:16:18 +0000 Commit: Piotr Pawel Stefaniak CommitDate: 2022-08-24 18:21:08 +0000 sh: nullify ENV in tests This is to avoid loading .shrc which may contain commands that would result in output different than expected. (cherry picked from commit a1423456415ad4784b31513cfe11438d2446881f) --- bin/sh/tests/builtins/cd10.0 | 2 +- bin/sh/tests/builtins/fc1.0 | 2 +- bin/sh/tests/execution/int-cmd1.0 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/sh/tests/builtins/cd10.0 b/bin/sh/tests/builtins/cd10.0 index f4b5e0ffca5c..5c165cb21fcc 100644 --- a/bin/sh/tests/builtins/cd10.0 +++ b/bin/sh/tests/builtins/cd10.0 @@ -3,4 +3,4 @@ # Precondition (cd /bin) || exit # Verify write error is ignored. -$SH +m -ic 'CDPATH=/:; cd bin 1output 2>error & +ENV= HISTFILE=/dev/null ${SH} +m -i output 2>error & { # Syntax error echo ')' >&3 diff --git a/bin/sh/tests/execution/int-cmd1.0 b/bin/sh/tests/execution/int-cmd1.0 index a1f097b774d6..6b1d366b2e7a 100644 --- a/bin/sh/tests/execution/int-cmd1.0 +++ b/bin/sh/tests/execution/int-cmd1.0 @@ -1,3 +1,3 @@ # $FreeBSD$ -! echo echo bad | $SH -ic 'fi' 2>/dev/null +! echo echo bad | ENV= $SH -ic 'fi' 2>/dev/null