From nobody Sat May 31 18:08:39 2025 X-Original-To: dev-commits-src-main@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 4b8p534kJbz5xNYt; Sat, 31 May 2025 18:08:39 +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 4b8p533Wgfz3scF; Sat, 31 May 2025 18:08:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748714919; 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=5kXwWQ/Q9fFhOvU5GsAv/n9uVNLt1Nd3tLoO19vy2dU=; b=miiHDqtioOAz8Ch5j0sZX1pBZjS8lCJmZsk9/IkxevG2a8pduywspyBbN+2Y8QAbttwu2i phppRtPWZ8JIygS/58LuOT9JEhQkRBYHpw9NvQSjCGjSr44jojFyQs9vWNhYJAdeOG+GmW TyAau286EHwbvUUifex0Ub6cg0kyTFyp+oF8Pkjksb9MgTm9NsQk42leUDA5VbptF+6ZLe 7GhIyVVrvnK/gx8H7TAWtJD3ru+53ObKh3XlQsqDkD8tANnkpqKYI+fuO7VOQBVTLo80Yb K9lANjLFWCoz6k/qGFL97Hj7BS1dLZdFZ+7k4Q4WFfDFVdLY9iiG3c/4i7/E0w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748714919; 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=5kXwWQ/Q9fFhOvU5GsAv/n9uVNLt1Nd3tLoO19vy2dU=; b=haRN1k746+iN8+TUbe/sj9ZrbKQFdHSSYi0m8fZRyaCvfIz8+eV3P3sb8CA3HYa0foi92a sYV28S9Rml8q/KZA7BxHTf5eBdUX6VaIbsXK8KFETjatHqErhyRgIRq4jZ9/D0kkvoMRdm yKW1pG88Fn2vjSr8yQVJoFBgpdDPgCDTTltJtCUibCrd0cyI3X6G7DTDmnxaW6oVe+WDTx HM9qZ2Km1NxQpQATaVDgNoh7ZuPoOqGWnShyKVo+s/6fxkOMP4pv2kgnrg/0Xhzk5FOZF2 2OfO/JdRf7I/CNiETtZgq3Xjw1o4gHWnjlagowEiC2UeKEkYS0V67If4ypuwTw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748714919; a=rsa-sha256; cv=none; b=Y7wBKEeRP8y6BvdptMa0X+A6N+4dNCKCno4rwbaF7keCP0bBpICP1JL6VUOMjCcbD50sf9 g9xUdsF0ZcIf3igB9n9adZNyaJKttS7lVgPI6hWIdR+x/6e3ZO2BqxzgjxZMO3El/MXTtD /3q61TeJf9ePeibCWhlriwzES2Wi6hc+qDjXKI71ebFWMzOJCZLg7/AlSfPwOgSAMLtjWp LIZCORLIrYZ8JW77xukIgCNFcidkEzx42cnC5OaE8ex5PMKFQA++FFo9VoynrIC3Dwq6dv nOFHqUzH9lrs0ThM8YXv0mT3Q4i5BdxbBKQ157bVGmbw85eajEVLj3H9v3idsw== 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 4b8p5336Wdzpdp; Sat, 31 May 2025 18:08:39 +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 54VI8dLf025617; Sat, 31 May 2025 18:08:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54VI8d6t025614; Sat, 31 May 2025 18:08:39 GMT (envelope-from git) Date: Sat, 31 May 2025 18:08:39 GMT Message-Id: <202505311808.54VI8d6t025614@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 81df03281359 - main - cp: Improve to_root test case. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 81df032813595a7c79e55bcba0c4e5d660451b58 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=81df032813595a7c79e55bcba0c4e5d660451b58 commit 81df032813595a7c79e55bcba0c4e5d660451b58 Author: Dag-Erling Smørgrav AuthorDate: 2025-05-31 18:07:57 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-05-31 18:08:12 +0000 cp: Improve to_root test case. Since the bug we're testing involved path name construction, we don't need to be root to test it; we can simply check the error message. Fixes: 537fbf70f12b Sponsored by: Klara, Inc. Reviewed by: allanjude Differential Revision: https://reviews.freebsd.org/D50628 --- bin/cp/tests/cp_test.sh | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/bin/cp/tests/cp_test.sh b/bin/cp/tests/cp_test.sh index 8511904a0e33..5e9a1899ff75 100755 --- a/bin/cp/tests/cp_test.sh +++ b/bin/cp/tests/cp_test.sh @@ -573,22 +573,23 @@ dstmode_body() atf_test_case to_root cleanup to_root_head() { - atf_set "require.user" "root" + atf_set "require.user" "unprivileged" } to_root_body() { - dst="$(atf_get ident).$$" + dst="test.$(atf_get ident).$$" echo "$dst" >dst echo "foo" >"$dst" - atf_check cp "$dst" / - atf_check cmp -s "$dst" "/$dst" - atf_check rm "/$dst" - atf_check cp "$dst" // - atf_check cmp -s "$dst" "/$dst" + atf_check -s not-exit:0 \ + -e match:"^cp: /$dst: (Permission|Read-only)" \ + cp "$dst" / + atf_check -s not-exit:0 \ + -e match:"^cp: /$dst: (Permission|Read-only)" \ + cp "$dst" // } to_root_cleanup() { - (dst=$(cat dst) && [ -n "/$dst" ] && [ -f "/$dst" ] && rm "/$dst") || true + (dst=$(cat dst) && rm "/$dst") 2>/dev/null || true } atf_init_test_cases()