mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-06-08 08:44:32 +02:00
5ae9609bbb
Upgrade to 0.8.11. While at it, also reduce the size of the patch and split it up into separate patches. This hopefully makes maintaining the patches are easier. The patches make it so that libz isn't statically linked, the "cli-docs" feature for manual pages with the CLI is disabled, and the exposed subcommands for the "cli-docs" feature are hidden because they're not available anyway. The code for D-Bus notifications and for displaying the manual pages isn't removed like before because this code is conditionally compiled in only when the features "dbus-notifications" and "cli-docs" are enabled. This shrinks the size of the patch significantly and shouldn't affect the size of the binary. Signed-off-by: Thomas Böhler <witcher@wiredspace.de>
50 lines
1.7 KiB
Diff
50 lines
1.7 KiB
Diff
From ec85201b8121e6ea2d81af0225197e9bc01251e5 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Thomas=20B=C3=B6hler?= <witcher@wiredspace.de>
|
|
Date: Sat, 26 Apr 2025 14:29:32 +0200
|
|
Subject: [PATCH 2/3] allow tests without cli-docs feature
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Signed-off-by: Thomas Böhler <witcher@wiredspace.de>
|
|
---
|
|
meli/tests/test_cli_subcommands.rs | 9 +++++++--
|
|
1 file changed, 7 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/meli/tests/test_cli_subcommands.rs b/meli/tests/test_cli_subcommands.rs
|
|
index 8f80046c..053d93e8 100644
|
|
--- a/meli/tests/test_cli_subcommands.rs
|
|
+++ b/meli/tests/test_cli_subcommands.rs
|
|
@@ -199,6 +199,7 @@ server_password_command = "false"
|
|
}
|
|
}
|
|
|
|
+#[cfg(feature = "cli-docs")]
|
|
fn test_subcommand_man(env: &Env) {
|
|
for (man, title) in [
|
|
("meli.1", "MELI(1)"),
|
|
@@ -320,8 +321,11 @@ fn run_cli_subcommands() {
|
|
help(&common_env);
|
|
test_subcommand_succeeds(&common_env, "help");
|
|
test_subcommand_succeeds(&common_env, "compiled-with");
|
|
- test_subcommand_succeeds(&common_env, "man");
|
|
- test_subcommand_man(&common_env);
|
|
+ #[cfg(feature = "cli-docs")]
|
|
+ {
|
|
+ test_subcommand_succeeds(&common_env, "man");
|
|
+ test_subcommand_man(&common_env);
|
|
+ }
|
|
test_subcommand_config_stdio(&common_env);
|
|
tmp_dir.close().unwrap();
|
|
}
|
|
@@ -329,6 +333,7 @@ fn run_cli_subcommands() {
|
|
let tmp_dir = TempDir::new().unwrap();
|
|
let mut common_env = make_common_env(tmp_dir.path());
|
|
|
|
+ #[cfg(feature = "cli-docs")]
|
|
test_subcommand_install_man(&common_env, tmp_dir.path());
|
|
|
|
let conf_path = tmp_dir.path().join("conf.toml");
|
|
--
|
|
2.49.0
|
|
|