From nobody Tue Jul 28 09:34:23 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 4h8VfS0jHLz6mSNr for ; Tue, 28 Jul 2026 09:34:24 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4h8VfR6V3Nz3W5s for ; Tue, 28 Jul 2026 09:34:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785231264; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=J88Vvk2sB66ziqBRA5fcD+VTKf/RQECq5gkvTp16H2Y=; b=S1e2DuHHvy0Qqwsk0lLCz8jqWJMhc+AJIrvaeI8/zB7YiUa5xiWxTRYxLOx7qYTT1yaJ/w G/AtofT64ENF1BhLlOiaJkNTYits2FuyIQZdz+/ayIqj5c5FS28J4s09658uU+/qH+qmzJ F0nw6AFg8n0xLrmLqoBqP8vx/DnkM2w4fFK2MOGApsHP4bYaUqNXcJEEifImBA2IpQ7BRl YeIbcC0AEei3eoLKi88U2JtXPCD4P1BwsxBhpMs1gW12QTkhVimCbOBiQta+1/m8pekYkQ O+wh422NkE+xVKxpZ8sRXfouRPqoQ2zqha3r6jKA2OlPQ+GgGN+9sg/b162zJA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1785231264; a=rsa-sha256; cv=none; b=qBul92B6jn7j6CiaRGDkJ9sHbVEw+gRSavfagF1k3416LarLqsTVQM7uykjTTUMHMy9M2H QUK4O/wCvMbvH0OtlPuvZygeTuou2/vlT6Hsrrhv5B7gAdVLs1iRXCRSiTcvqSFwjRNwem XKGLWEN2X/UmgUaQfdMAxbTH2oYr6UcbLJ5qTNpCpaCgUKnYYnPBj+L+XWpC9uUHOKh+XN xg1WChaQN8ETlkpHfKi7qJqZmq+3jPSVzC/i5TtzsfaCulm5fUhbIlTR++3TxkBYckaQJq nifpTAYYokeyyYEiqX8/2eAzM4rrKWA6rx3RBG3n349bMH4UzHP25Mdo9J6U7g== 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=1785231264; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=J88Vvk2sB66ziqBRA5fcD+VTKf/RQECq5gkvTp16H2Y=; b=t5zvzRYIen8F6hayxLkT+CXNVPPQNZtjKu45r7sV3p11Y+smPWCqFFRM7hDCGAyqMkrIz8 SR0KvgxQUyszkRqnFxcNrrWBEhisV7T/+KAhmNYeq6ymQbm3V8HKbwljcIHS7L861zYq/5 KK98i4hueRR5AN9ajIxYVgyA1VbuADZBUiSY+/O1MiS54AZ3jsvBbjlJooEwkZ4UsUyAbg NIRbT5HEvp7tWKMEHRZfFgTTD2Kt85EE9y6lKp1s80caQ45VB1Sc4V0t5IwW/GWcVA6TmB 3pfc6+ZAyB+jwZ17aXwBs5H+cODW2VlcG1CEk9XmkQGhQt3MJNMhS/Mt27s5Lw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h8VfR5L09zb4c for ; Tue, 28 Jul 2026 09:34:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c719 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 28 Jul 2026 09:34:23 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Ed Maste From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 23f153a17725 - stable/14 - 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: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 23f153a177250f74230a0441e77b283437d6bf31 Auto-Submitted: auto-generated Date: Tue, 28 Jul 2026 09:34:23 +0000 Message-Id: <6a68779f.1c719.4ccfa02a@gitrepo.freebsd.org> The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=23f153a177250f74230a0441e77b283437d6bf31 commit 23f153a177250f74230a0441e77b283437d6bf31 Author: Ed Maste AuthorDate: 2026-06-03 14:13:45 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-07-28 09:31:41 +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