Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 28 Jul 2026 09:34:23 +0000
From:      Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav <des@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Cc:        Ed Maste <emaste@FreeBSD.org>
Subject:   git: 23f153a17725 - stable/14 - xinstall: Add test for -d -s not allowed together
Message-ID:  <6a68779f.1c719.4ccfa02a@gitrepo.freebsd.org>

index | next in thread | raw e-mail

The branch stable/14 has been updated by des:

URL: https://cgit.FreeBSD.org/src/commit/?id=23f153a177250f74230a0441e77b283437d6bf31

commit 23f153a177250f74230a0441e77b283437d6bf31
Author:     Ed Maste <emaste@FreeBSD.org>
AuthorDate: 2026-06-03 14:13:45 +0000
Commit:     Dag-Erling Smørgrav <des@FreeBSD.org>
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


home | help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6a68779f.1c719.4ccfa02a>