From nobody Tue Apr 19 04:04:42 2022 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 0392111DAE35; Tue, 19 Apr 2022 04:04:43 +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 4Kj9DV6dM7z3CKK; Tue, 19 Apr 2022 04:04:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650341082; 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=wp6cl3vlirJwEpKPKWD+8KSGHOwWkB//E6C8Uer2PuY=; b=souOwO4fCgCmA411wjQitVH3yamh8esc+pBVXWs0RDLPFECXq6gduwFVakwiDK9VJmHeGO HRdaO8pE+ZpzlMiCxvWoMQVn9aFIIzfAmyHMRcluPv2Br3GgMcsCoGmFcfqrG/usgP0dpC lgXW90g+wezt/5N4d/MyTEk1KcRxdcV5e4RcPeWcH+7WZ0RSJe8ODHcab25LV2CdnZlGof duvmc5pOr9rzO3KskpPqVE6AxtNyqmT3m6LjtdvXF1RMtTesdMeevfIb95jynXavdkXuYM NXXUEfQeaX+Xxuf+aUSIRaNrV5UROzqnSfgWQMXn4cVxy8ibBNVViGOrSfLmlQ== 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 C35EC202D8; Tue, 19 Apr 2022 04:04:42 +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 23J44glK017498; Tue, 19 Apr 2022 04:04:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23J44gpZ017497; Tue, 19 Apr 2022 04:04:42 GMT (envelope-from git) Date: Tue, 19 Apr 2022 04:04:42 GMT Message-Id: <202204190404.23J44gpZ017497@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: efba49ee5a64 - main - diff: tests: loosen up requirements for report_identical 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: efba49ee5a64f8f56f49e58887484284d785d542 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650341082; 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=wp6cl3vlirJwEpKPKWD+8KSGHOwWkB//E6C8Uer2PuY=; b=G/PnqV+pbKf6/nCGve7ieTj2NN5z/j940XvX8dhwrAE3NqL6Z+NhgBfvsbj17ElsNsdYNO FAQLRIQN8ld2m/fW0ukQd9U9qIFAbgnWkPPchfOrFyfynPxIF70Y70ByNACvvFItE9WsGv SLXVufDeCtpPbnAUacaNKHTTFMuLxP3Wd2rqzsC3ikjL0KWZZZSusqWYvK5KwoHeM+B4WH nBqrFiwRipPnohTRLxpHARvy8RyqNAValeKOb8/GRUzfcbqqNMj4I8Zg3V3aRwzvLcSaDw AJbOLJgyPEXvcvieL2NcaauyuPVTJj5Sfy97T4tOvLc0Q2S5r38MvSl/bQK9Mg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650341082; a=rsa-sha256; cv=none; b=a7oi6ckJK7pqOOEyeELSjuWWmYWR0WiQ4U0BaIoz5C1n2Nih7hWPYL2+5cnFXw3Mfq0sfs ZlNBEylYNAASmJPezECiacDle2mfQU0hoFhgP/sqZ7DkPnhd5TpgO74Jua3fJZmkOMbcvf zRVH3F0647Lg46L/dMG7S4kayaHEi/TtWxLy+SCGx7bCMwQZThgPOLhE2bxq3zxTSBX8N/ 7fLX8Q/sfxfPjxwR2mBnaNlK7AWskXb3qUv1dcQyO898+hELl4qRvSj+Ze0FypXXYX0Z5x wtwvR1Yiap/gXxSavgF5fpZtGDBo1ckp2hLrFkMockTS2eV3YTONWeKi22h/3w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=efba49ee5a64f8f56f49e58887484284d785d542 commit efba49ee5a64f8f56f49e58887484284d785d542 Author: Kyle Evans AuthorDate: 2022-04-19 04:04:13 +0000 Commit: Kyle Evans CommitDate: 2022-04-19 04:04:13 +0000 diff: tests: loosen up requirements for report_identical This test cannot run without an unprivileged_user being specified anyways, so just run as the unprivileged user. Revoking read permisions works just as well if you're guaranteed non-root. Reviewed by: pstef Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D34950 --- usr.bin/diff/tests/diff_test.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/usr.bin/diff/tests/diff_test.sh b/usr.bin/diff/tests/diff_test.sh index fa76c7ada3eb..e0968706acfb 100755 --- a/usr.bin/diff/tests/diff_test.sh +++ b/usr.bin/diff/tests/diff_test.sh @@ -243,17 +243,15 @@ label_body() report_identical_head() { - atf_set "require.config" unprivileged_user - atf_set "require.user" root + atf_set "require.user" unprivileged } report_identical_body() { - UNPRIVILEGED_USER=$(atf_config_get unprivileged_user) printf "\tA\n" > A printf "\tB\n" > B chmod -r B atf_check -s exit:2 -e inline:"diff: B: Permission denied\n" \ - -o empty su -m "$UNPRIVILEGED_USER" -c 'diff -s A B' + -o empty diff -s A B } non_regular_file_body()