From nobody Sun Nov 17 17:42:19 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 4Xrykh1zRxz5dBXd; Sun, 17 Nov 2024 17:42:20 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xrykg6HWmz4j0q; Sun, 17 Nov 2024 17:42:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731865339; 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=5p7nR7vT02DsjUQvYZOqp4yWE+SnPdeyFQbn/BGqyxU=; b=wQeRn1JGTFeDoskqwAQI5WBp0Hsk7Zq7gLoMZxE1WENMLdbRoM2g6dHzMUCU8Vws9YBBv1 K51DBsqJtFa0A0xEEXKnxYex22b4yM2aN40Qa42dOLP5hTMBpt+rtD2PbDIL/a9NwgF0QY sdq3CmOors+QSmrOkF8hS2N6XZgmb7PLMtUfvxuPcAGnZuAw/dcZxtv5izSHcA9UMsXzgc sRalw+/YsbhKetZoYviwQTJXjEnGa1zgRlG7Vd2UiU5Bh4QYCxuFCj1WbT410Dqi0u9qwX xuJyyVpGJpmQrECR4epgFVXeadMlcjW6YOy3chz9F3w2w/Vcw6U8B+QgulySjQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731865339; 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=5p7nR7vT02DsjUQvYZOqp4yWE+SnPdeyFQbn/BGqyxU=; b=DtwViKe7lrjKW657AS6PtESOkEAmgEuxZe26ho2dGvepW/mLe4t0RQ9N8E0BTwK2I+eO1e QIsQVO0IgAXBdnV4iUCCboIpQy7/Zw7kgRcT3y7T2v6qkimj2ztk4/8gmtwRG8mlUNV4Jm qpfTUO4N9U/976Kj1QKaN08rVsdhf7SxFqO4gz55/m7ftqkAj33SZOV9JL4P8zSO9IOSzb u5lEJqVLV0fN9vXZEUiWSV5laoNbvLzeRzbDNuz/RvedTg0mr8mbhlvlMrhjzxMEP9cPpL RmQuI9FmbDIbtu7j9sUyuzuOIE4m9GzIMcV+eKRdjNAaM7E4K5hhk6/fikLmcA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1731865339; a=rsa-sha256; cv=none; b=YAVqiIetXzvzHVmuteeAvV1MIp+E3XTW6GfUeXD5lAc6wyCA46rgxZrARGx4KhR7jcBT6J G2KeNoTnuPi8xSFg0dShPs6U4vkv1d14SGnaF3WH8pZuTuEsk9fsOcjMsLUvm9+NMwpmMs i87UTejYxbZk2DCLT8NKNCGeDulkQfI5xHUHhlqBzXmHSykxZ816on39J2/pg5qHWSenJm Mm4iPlzgIzTki+S8+sS6A9h3C35fBzsSjeFdrGDEFeQ7HFgMkPZEg5v3iKnEeLExvcuq1C H6zg7h2tOHMSuY5FxiTtepiIFDDb+dp5U9XQjcbkYK35jmDn9Yt9e/4w7qzNjA== 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 4Xrykg5nWbz12LP; Sun, 17 Nov 2024 17:42:19 +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 4AHHgJb0036011; Sun, 17 Nov 2024 17:42:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AHHgJuX036008; Sun, 17 Nov 2024 17:42:19 GMT (envelope-from git) Date: Sun, 17 Nov 2024 17:42:19 GMT Message-Id: <202411171742.4AHHgJuX036008@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: aab7f19974a2 - main - sh tests: Fix ktrace usage now that envvars are traced by default 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: aab7f19974a27cac3c1088f486074c05bf95017a Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=aab7f19974a27cac3c1088f486074c05bf95017a commit aab7f19974a27cac3c1088f486074c05bf95017a Author: Mark Johnston AuthorDate: 2024-11-17 17:37:34 +0000 Commit: Mark Johnston CommitDate: 2024-11-17 17:37:34 +0000 sh tests: Fix ktrace usage now that envvars are traced by default Some sh tests use ktrace to see whether a particular file, specified in the environment, was accessed by the shell. After commit 65a4daeaf324, this test matches the ktrace record generated by execve. Use ktrace to only log name lookups, to avoid such false matches. Fixes: 65a4daeaf324 ("ktrace: log execve(2) arguments and environment") --- bin/sh/tests/parameters/mail1.0 | 2 +- bin/sh/tests/parameters/mail2.0 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/sh/tests/parameters/mail1.0 b/bin/sh/tests/parameters/mail1.0 index 09102d811513..42e712e31ac9 100644 --- a/bin/sh/tests/parameters/mail1.0 +++ b/bin/sh/tests/parameters/mail1.0 @@ -3,7 +3,7 @@ goodfile=/var/empty/sh-test-goodfile mailfile=/var/empty/sh-test-mailfile T=$(mktemp sh-test.XXXXXX) || exit -MAIL=$mailfile ktrace -i -f "$T" ${SH} -c "[ -s $goodfile ]" 2>/dev/null +MAIL=$mailfile ktrace -t n -i -f "$T" ${SH} -c "[ -s $goodfile ]" 3>/dev/null if ! grep -q $goodfile "$T"; then # ktrace problem rc=0 diff --git a/bin/sh/tests/parameters/mail2.0 b/bin/sh/tests/parameters/mail2.0 index d594c4a74356..b1f48e0b29db 100644 --- a/bin/sh/tests/parameters/mail2.0 +++ b/bin/sh/tests/parameters/mail2.0 @@ -3,7 +3,7 @@ goodfile=/var/empty/sh-test-goodfile mailfile=/var/empty/sh-test-mailfile T=$(mktemp sh-test.XXXXXX) || exit -ENV=$goodfile MAIL=$mailfile ktrace -i -f "$T" ${SH} +m -i /dev/null 2>&1 +ENV=$goodfile MAIL=$mailfile ktrace -t n -i -f "$T" ${SH} +m -i /dev/null 2>&1 if ! grep -q $goodfile "$T"; then # ktrace problem rc=0