git: 88534471b32c - stable/15 - xinstall: Add test for -d -s not allowed together
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 10 Jun 2026 13:44:59 UTC
The branch stable/15 has been updated by emaste:
URL: https://cgit.FreeBSD.org/src/commit/?id=88534471b32cb7f57bafac2d215c05d5e7dabda0
commit 88534471b32cb7f57bafac2d215c05d5e7dabda0
Author: Ed Maste <emaste@FreeBSD.org>
AuthorDate: 2026-06-03 14:13:45 +0000
Commit: Ed Maste <emaste@FreeBSD.org>
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