From nobody Wed Jun 10 13:44:59 2026 X-Original-To: dev-commits-src-branches@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 4gb6Tl5B94z6gRbP for ; Wed, 10 Jun 2026 13:44:59 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gb6Tl1JjKz3M1f for ; Wed, 10 Jun 2026 13:44:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1781099099; 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=OO/J885mRLwDk1/M/YVRlpOcRnFgez+yTQnk8SGkK30=; b=YjvoY26c66tw8r7xlXb9CwmNgmMV6edZYEGvDTKSdKdk6BCRK4qdWam9E1Xifm3HotB8c+ SLcT04kP3vE8o7Lfp4M4uVtzWdFQsCA5XMG/ImxRTYQ8U+dS+DjT9MBxiGirHIidhGCKOz q6YvyD6jlCafS9lDlwVVH1FblbEFnEUWt+8fyMz9LJHIOKnYMzDL9Pm01v5r8d3w8vqjdf hIp7BzzTAs11gO3sNXOWHtGgQJbeaDURnNEEKaoeNHqvomrbHp1bcZkIBzhVRstr/fM9hc AR/KYKcG0OkAyr+qZo8e2fVv4ewILe5AIrPgI2z+AL71RvnRg6HfnHrrY1y3EA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1781099099; a=rsa-sha256; cv=none; b=l5v4CVhAj2blOWrKLjbVtwZyNHNc1wrkmWxEkLkruSKpy8LIRlJPJ3eMmj9CHS1GkWbSgP X6ZqmTfrxjl9eD03dUMGiMjnN0+BGUUD30TPoUUD2uGAz5fxkNY6xGckURjNry+ryIpIz1 s5zR5NIcY3Osm5gDaJ1nzo/8dO5wR+/CCD7Sr5wgybo6XlbWGlUcHCElEItdFCfJG31QyY 8tLLfR4kqlJNlQgzCx/7Vlf5oDioMK1g/b1CBBlAQPKikRO5nFNO1Z4fYJmMSf6CovlJ0Z RogvG4fFkd7UKFN2LwzSHyVA4d2re5EpJmRx4GR7ozKTeOXgKvGXi6rGksBlVQ== 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=1781099099; 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=OO/J885mRLwDk1/M/YVRlpOcRnFgez+yTQnk8SGkK30=; b=aFx6r1ccrat7WDdGt8br22mSiOa13yqCnD1qpxuFzuBM5yd/0fo3u2wAP0nLLG/DyJGZSJ esQz+L+d4iQyw826+wPic/X/TytEKNO9Pca7KPnmG00MIewH+Ew1UpOMFm90usF2SeU2E1 hiBb3xCtby2VKt+lkspHz0GasxRqD0xIxzxmPTOYR4I1htHZmyvfn5iNFR0onmFvUkql/1 ZqEnlX0xsFdqzqD2bXAZjp3IoVrLx1XFY2BAH+/BkfxSrqYC33uYgn+Xlk/s17B02ZuSsY 99d4hGS5AE8cY9clq9ldhuiekzok97+6EWjj0v6ipLtqefuCpxjaIkdt3Br57A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gb6Tl0tSnz1Mbn for ; Wed, 10 Jun 2026 13:44:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e00b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 10 Jun 2026 13:44:59 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 88534471b32c - stable/15 - xinstall: Add test for -d -s not allowed together List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 88534471b32cb7f57bafac2d215c05d5e7dabda0 Auto-Submitted: auto-generated Date: Wed, 10 Jun 2026 13:44:59 +0000 Message-Id: <6a296a5b.1e00b.5071d72d@gitrepo.freebsd.org> The branch stable/15 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=88534471b32cb7f57bafac2d215c05d5e7dabda0 commit 88534471b32cb7f57bafac2d215c05d5e7dabda0 Author: Ed Maste AuthorDate: 2026-06-03 14:13:45 +0000 Commit: Ed Maste CommitDate: 2026-06-10 13:43:59 +0000 xinstall: Add test for -d -s not allowed together Reviewed by: des Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D57403 (cherry picked from commit 4908bea5b7f5de70032e201e718958ef40bc3b03) --- usr.bin/xinstall/tests/install_test.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/usr.bin/xinstall/tests/install_test.sh b/usr.bin/xinstall/tests/install_test.sh index 3cea648aa805..6b091f26b377 100755 --- a/usr.bin/xinstall/tests/install_test.sh +++ b/usr.bin/xinstall/tests/install_test.sh @@ -25,6 +25,12 @@ # # +atf_test_case incompatible_opts +incompatible_opts_body() { + atf_check -s not-exit:0 -e match:"specified together" \ + install -s -d dir1 +} + atf_test_case copy_to_empty copy_to_empty_body() { printf 'test\n123\r456\r\n789\0z' >testf @@ -549,6 +555,7 @@ digest_body() { } atf_init_test_cases() { + atf_add_test_case incompatible_opts atf_add_test_case copy_to_empty atf_add_test_case copy_to_nonexistent atf_add_test_case copy_to_nonexistent_dir