From nobody Wed Jun 3 15:33:16 2026 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 4gVsD172HLz6g5TT for ; Wed, 03 Jun 2026 15:33:21 +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 4gVsD15yBbz3jHC for ; Wed, 03 Jun 2026 15:33:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1780500801; 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=RC4owOGYAelHrHqCPbH6MadIiT12/6GSq03r5BZN6Ss=; b=qBqvSJvMAFWW0NuaHsaBXIyrqMPeuMrISCiSb+u2TV2Sy6Q6wY3FTyy2zyPUSVPNdoZeZ9 Jts+m5KEqbwZvHVV/GjIIdDFVwLNqQY54hImjaN5Ju4AyA9tGBYy6jD0xVgHuzD+FgLcCk YHIvsWQ7YNgn2KSdG+LxUiWmVKAtuiLmXtfwuAQPjS4B+gMwC3tqgWKmImmR8PKcskNR0q iIg90qcgYzgQcurjE1dKeFcTY3PsCGTR34+bbC3vsmN8pyutAWN2c6A2KQWVD9ywEBS35S rpAhUmM6HBH+zUmEKAIdfT0gcxgoabs4v1EA+hCushhaIPb34rwW0Pn4gEm/eg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1780500801; a=rsa-sha256; cv=none; b=psgfLr0CzjJy/OMfkfeC/JAsfnkrPWg8zUM4wW0MAlCLjR4PBQvX6E3swZvBK+xg6spYfA NS0YttOfhHuZpNu85NHWoUU+Zb1jAASW+S0OIb/AHcCaFcpGx7+ZaHB74QrEtmdo0XgnUt mhoQCVLrv/jKOU3j+qItfvXmuBZeinYNHR+EudhpRNv0FYW7YnidYxrgYAPPivRYQwsXOM LOLkN2KGHcs1+MQ4uX6lHSTAxu4DgVNuZg0FtScxe7ducKsMyGKgAidJp2BOfXYuHQNcGU MB+7Kl4fedboTsT6N2hjRBgJq01e/lmaozfPWS3VlULPDLp4k6y+jhdNiw/UBQ== 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=1780500801; 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=RC4owOGYAelHrHqCPbH6MadIiT12/6GSq03r5BZN6Ss=; b=l+u5blo4SS7FYOjkHgTms6qb8HVQbptcCz4vV+vKyun4zZYPwpNYoDXbTxmnCUhIpMmTHt 68Eio9syv/l3mR/V8eESEWntbCrWlWS8tLTzzvNeMNUDHOvJAc1zwv1VaSDLKB2x/04aYk CEaTWRNE3vh1a0kQErmcGsJN8M7fQP16vkkdEdfJHnTD6dukIePguR4kxXv3Ijxp6zYHg7 RYOkQtDTANj6RP0xhRr3PEN2L/F3RvkaJwOfTWhETvjaASYFzXETza7IEzQ9BWQG6wOxSn S/hQkNBx9VyVt8Kl8zzFefMUMU6Cst23pOjphRy/jnOm6Lfs0jr8o2yRCLddUA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gVsD15YqBz32c for ; Wed, 03 Jun 2026 15:33:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 40f81 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 03 Jun 2026 15:33:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 4908bea5b7f5 - main - xinstall: Add test for -d -s not allowed together 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 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/main X-Git-Reftype: branch X-Git-Commit: 4908bea5b7f5de70032e201e718958ef40bc3b03 Auto-Submitted: auto-generated Date: Wed, 03 Jun 2026 15:33:16 +0000 Message-Id: <6a20493c.40f81.7cf63b72@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=4908bea5b7f5de70032e201e718958ef40bc3b03 commit 4908bea5b7f5de70032e201e718958ef40bc3b03 Author: Ed Maste AuthorDate: 2026-06-03 14:13:45 +0000 Commit: Ed Maste CommitDate: 2026-06-03 15:33:05 +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 --- 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