From 58902071d8ca6e7a2d3074c81def026316a53b6a Mon Sep 17 00:00:00 2001 From: idealseal Date: Mon, 9 Mar 2026 13:00:38 +0000 Subject: [PATCH] */*: use skip_tests variable from cargo.eclass Signed-off-by: idealseal Part-of: https://codeberg.org/gentoo/gentoo/pulls/269 Merges: https://codeberg.org/gentoo/gentoo/pulls/269 Signed-off-by: Matt Jolly --- app-editors/zed/zed-0.226.4.ebuild | 5 +++-- app-misc/skim/skim-1.5.1.ebuild | 13 ++++++------- app-misc/skim/skim-1.9.1.ebuild | 13 ++++++------- app-misc/skim/skim-2.0.2.ebuild | 13 ++++++------- dev-util/maturin/maturin-1.11.5.ebuild | 20 ++++++++++---------- dev-util/maturin/maturin-1.12.5.ebuild | 20 ++++++++++---------- dev-util/maturin/maturin-1.12.6.ebuild | 20 ++++++++++---------- dev-vcs/jj/jj-0.36.0.ebuild | 21 +++++++-------------- dev-vcs/jj/jj-0.37.0.ebuild | 19 ++++++------------- dev-vcs/jj/jj-0.38.0.ebuild | 19 ++++++------------- dev-vcs/jj/jj-0.39.0.ebuild | 19 ++++++------------- net-analyzer/rustscan/rustscan-2.4.1.ebuild | 12 ++++++------ net-misc/hurl/hurl-7.0.0.ebuild | 13 ++++++------- sys-process/below/below-0.11.0-r1.ebuild | 16 ++++++++-------- 14 files changed, 96 insertions(+), 127 deletions(-) diff --git a/app-editors/zed/zed-0.226.4.ebuild b/app-editors/zed/zed-0.226.4.ebuild index 7a40bca8b32f5..d68679abfc79a 100644 --- a/app-editors/zed/zed-0.226.4.ebuild +++ b/app-editors/zed/zed-0.226.4.ebuild @@ -240,6 +240,7 @@ src_test () { mkdir -p "${HOME}/.config/zed" || die mkdir -p "${HOME}/.local/share/zed/logs/" || die - SHELL=/usr/bin/sh RUST_BACKTRACE=full cargo_src_test -vv \ - -- --skip zed::tests::test_window_edit_state_restoring_enabled + local CARGO_SKIP_TESTS=( zed::tests::test_window_edit_state_restoring_enabled ) + + SHELL=/usr/bin/sh RUST_BACKTRACE=full cargo_src_test -vv } diff --git a/app-misc/skim/skim-1.5.1.ebuild b/app-misc/skim/skim-1.5.1.ebuild index d699d0cbbb280..6e6dbe2a900c5 100644 --- a/app-misc/skim/skim-1.5.1.ebuild +++ b/app-misc/skim/skim-1.5.1.ebuild @@ -334,13 +334,12 @@ src_configure() { cargo_src_configure --no-default-features } -src_test() { - cargo_src_test --bins --lib -- \ - --skip test_ansi_flag_disabled \ - --skip test_ansi_flag_enabled \ - --skip test_ansi_flag_no_strip \ - --skip test_ansi_matching_on_stripped_text -} +CARGO_SKIP_TESTS=( + test_ansi_flag_disabled + test_ansi_flag_enabled + test_ansi_flag_no_strip + test_ansi_matching_on_stripped_text +) src_install() { # prevent cargo_src_install() blowing up on man installation diff --git a/app-misc/skim/skim-1.9.1.ebuild b/app-misc/skim/skim-1.9.1.ebuild index 7141c39f3e2a0..fcf2ea6873317 100644 --- a/app-misc/skim/skim-1.9.1.ebuild +++ b/app-misc/skim/skim-1.9.1.ebuild @@ -335,13 +335,12 @@ src_configure() { cargo_src_configure --no-default-features } -src_test() { - cargo_src_test --bins --lib -- \ - --skip test_ansi_flag_disabled \ - --skip test_ansi_flag_enabled \ - --skip test_ansi_flag_no_strip \ - --skip test_ansi_matching_on_stripped_text -} +CARGO_SKIP_TESTS=( + test_ansi_flag_disabled + test_ansi_flag_enabled + test_ansi_flag_no_strip + test_ansi_matching_on_stripped_text +) src_install() { # prevent cargo_src_install() blowing up on man installation diff --git a/app-misc/skim/skim-2.0.2.ebuild b/app-misc/skim/skim-2.0.2.ebuild index ba974ddf70d11..b7b55c10071d7 100644 --- a/app-misc/skim/skim-2.0.2.ebuild +++ b/app-misc/skim/skim-2.0.2.ebuild @@ -347,13 +347,12 @@ src_configure() { cargo_src_configure --no-default-features } -src_test() { - cargo_src_test --bins --lib -- \ - --skip test_ansi_flag_disabled \ - --skip test_ansi_flag_enabled \ - --skip test_ansi_flag_no_strip \ - --skip test_ansi_matching_on_stripped_text -} +local CARGO_SKIP_TESTS=( + test_ansi_flag_disabled + test_ansi_flag_enabled + test_ansi_flag_no_strip + test_ansi_matching_on_stripped_text +) src_install() { # prevent cargo_src_install() blowing up on man installation diff --git a/dev-util/maturin/maturin-1.11.5.ebuild b/dev-util/maturin/maturin-1.11.5.ebuild index ab1b5a405d2f0..859394f0f6963 100644 --- a/dev-util/maturin/maturin-1.11.5.ebuild +++ b/dev-util/maturin/maturin-1.11.5.ebuild @@ -122,25 +122,25 @@ python_test() { # need this for (new) python versions not yet recognized by pyo3 local -x PYO3_USE_ABI3_FORWARD_COMPATIBILITY=1 - local skip=( + local CARGO_SKIP_TESTS=( # picky cli output test that easily benignly fail (bug #937992) - --skip cli_tests + cli_tests # avoid need for wasm over a single hello world test - --skip integration_wasm_hello_world + integration_wasm_hello_world # fragile depending on rust version, also wants libpypy*-c.so for pypy - --skip pyo3_no_extension_module + pyo3_no_extension_module # unimportant tests that require uv, and not obvious to get it # to work with network-sandbox (not worth the trouble) - --skip develop_hello_world::case_2 - --skip develop_pyo3_ffi_pure::case_2 + develop_hello_world::case_2 + develop_pyo3_ffi_pure::case_2 # compliance test using zig requires an old libc to pass (bug #946967) - --skip integration_pyo3_mixed_py_subdir + integration_pyo3_mixed_py_subdir # these currently attempt to install tomli regardless of python version - --skip pep517_default_profile - --skip pep517_editable_profile + pep517_default_profile + pep517_editable_profile ) - cargo_src_test -- "${skip[@]}" + cargo_src_test } python_install_all() { diff --git a/dev-util/maturin/maturin-1.12.5.ebuild b/dev-util/maturin/maturin-1.12.5.ebuild index ede1e3b16a25d..9e23fbd841bd3 100644 --- a/dev-util/maturin/maturin-1.12.5.ebuild +++ b/dev-util/maturin/maturin-1.12.5.ebuild @@ -122,25 +122,25 @@ python_test() { # need this for (new) python versions not yet recognized by pyo3 local -x PYO3_USE_ABI3_FORWARD_COMPATIBILITY=1 - local skip=( + local CARGO_SKIP_TESTS=( # picky cli output test that easily benignly fail (bug #937992) - --skip cli_tests + cli_tests # avoid need for wasm over a single hello world test - --skip integration_wasm_hello_world + integration_wasm_hello_world # fragile depending on rust version, also wants libpypy*-c.so for pypy - --skip pyo3_no_extension_module + pyo3_no_extension_module # unimportant tests that require uv, and not obvious to get it # to work with network-sandbox (not worth the trouble) - --skip develop_hello_world::case_2 - --skip develop_pyo3_ffi_pure::case_2 + develop_hello_world::case_2 + develop_pyo3_ffi_pure::case_2 # compliance test using zig requires an old libc to pass (bug #946967) - --skip integration_pyo3_mixed_py_subdir + integration_pyo3_mixed_py_subdir # these currently attempt to install tomli regardless of python version - --skip pep517_default_profile - --skip pep517_editable_profile + pep517_default_profile + pep517_editable_profile ) - cargo_src_test -- "${skip[@]}" + cargo_src_test } python_install_all() { diff --git a/dev-util/maturin/maturin-1.12.6.ebuild b/dev-util/maturin/maturin-1.12.6.ebuild index 0d0e6a045a799..80a1f9824c6fb 100644 --- a/dev-util/maturin/maturin-1.12.6.ebuild +++ b/dev-util/maturin/maturin-1.12.6.ebuild @@ -122,25 +122,25 @@ python_test() { # need this for (new) python versions not yet recognized by pyo3 local -x PYO3_USE_ABI3_FORWARD_COMPATIBILITY=1 - local skip=( + local CARGO_SKIP_TESTS=( # picky cli output test that easily benignly fail (bug #937992) - --skip cli_tests + cli_tests # avoid need for wasm over a single hello world test - --skip integration_wasm_hello_world + integration_wasm_hello_world # fragile depending on rust version, also wants libpypy*-c.so for pypy - --skip pyo3_no_extension_module + pyo3_no_extension_module # unimportant tests that require uv, and not obvious to get it # to work with network-sandbox (not worth the trouble) - --skip develop_hello_world::case_2 - --skip develop_pyo3_ffi_pure::case_2 + develop_hello_world::case_2 + develop_pyo3_ffi_pure::case_2 # compliance test using zig requires an old libc to pass (bug #946967) - --skip integration_pyo3_mixed_py_subdir + integration_pyo3_mixed_py_subdir # these currently attempt to install tomli regardless of python version - --skip pep517_default_profile - --skip pep517_editable_profile + pep517_default_profile + pep517_editable_profile ) - cargo_src_test -- "${skip[@]}" + cargo_src_test } python_install_all() { diff --git a/dev-vcs/jj/jj-0.36.0.ebuild b/dev-vcs/jj/jj-0.36.0.ebuild index 669db16efb8ab..4afe444ef4e3a 100644 --- a/dev-vcs/jj/jj-0.36.0.ebuild +++ b/dev-vcs/jj/jj-0.36.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 2025 Gentoo Authors +# Copyright 2025-2026 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # Autogenerated by pycargoebuild 0.15.0 @@ -40,19 +40,12 @@ DOCS=( demos/ ) -src_test() { - local -a cargo_skip_tests=( - # skip tests that fail in sandbox environment - test_gpg::gpgsm_signing_roundtrip - test_gpg::gpgsm_signing_roundtrip_explicit_key - test_gpg::gpgsm_unknown_key - ) - - local -a skip_params - readarray -t skip_params < <(printf -- '--skip\n%s\n' "${cargo_skip_tests[@]}") - - cargo_src_test -- "${skip_params[@]}" -} +CARGO_SKIP_TESTS=( + # skip tests that fail in sandbox environment + test_gpg::gpgsm_signing_roundtrip + test_gpg::gpgsm_signing_roundtrip_explicit_key + test_gpg::gpgsm_unknown_key +) src_install() { pushd cli >/dev/null || die diff --git a/dev-vcs/jj/jj-0.37.0.ebuild b/dev-vcs/jj/jj-0.37.0.ebuild index 96850fadbc667..db72d2b04d97e 100644 --- a/dev-vcs/jj/jj-0.37.0.ebuild +++ b/dev-vcs/jj/jj-0.37.0.ebuild @@ -40,19 +40,12 @@ DOCS=( demos/ ) -src_test() { - local -a cargo_skip_tests=( - # skip tests that fail in sandbox environment - test_gpg::gpgsm_signing_roundtrip - test_gpg::gpgsm_signing_roundtrip_explicit_key - test_gpg::gpgsm_unknown_key - ) - - local -a skip_params - readarray -t skip_params < <(printf -- '--skip\n%s\n' "${cargo_skip_tests[@]}") - - cargo_src_test -- "${skip_params[@]}" -} +CARGO_SKIP_TESTS=( + # skip tests that fail in sandbox environment + test_gpg::gpgsm_signing_roundtrip + test_gpg::gpgsm_signing_roundtrip_explicit_key + test_gpg::gpgsm_unknown_key +) src_install() { pushd cli >/dev/null || die diff --git a/dev-vcs/jj/jj-0.38.0.ebuild b/dev-vcs/jj/jj-0.38.0.ebuild index 96850fadbc667..db72d2b04d97e 100644 --- a/dev-vcs/jj/jj-0.38.0.ebuild +++ b/dev-vcs/jj/jj-0.38.0.ebuild @@ -40,19 +40,12 @@ DOCS=( demos/ ) -src_test() { - local -a cargo_skip_tests=( - # skip tests that fail in sandbox environment - test_gpg::gpgsm_signing_roundtrip - test_gpg::gpgsm_signing_roundtrip_explicit_key - test_gpg::gpgsm_unknown_key - ) - - local -a skip_params - readarray -t skip_params < <(printf -- '--skip\n%s\n' "${cargo_skip_tests[@]}") - - cargo_src_test -- "${skip_params[@]}" -} +CARGO_SKIP_TESTS=( + # skip tests that fail in sandbox environment + test_gpg::gpgsm_signing_roundtrip + test_gpg::gpgsm_signing_roundtrip_explicit_key + test_gpg::gpgsm_unknown_key +) src_install() { pushd cli >/dev/null || die diff --git a/dev-vcs/jj/jj-0.39.0.ebuild b/dev-vcs/jj/jj-0.39.0.ebuild index 96850fadbc667..db72d2b04d97e 100644 --- a/dev-vcs/jj/jj-0.39.0.ebuild +++ b/dev-vcs/jj/jj-0.39.0.ebuild @@ -40,19 +40,12 @@ DOCS=( demos/ ) -src_test() { - local -a cargo_skip_tests=( - # skip tests that fail in sandbox environment - test_gpg::gpgsm_signing_roundtrip - test_gpg::gpgsm_signing_roundtrip_explicit_key - test_gpg::gpgsm_unknown_key - ) - - local -a skip_params - readarray -t skip_params < <(printf -- '--skip\n%s\n' "${cargo_skip_tests[@]}") - - cargo_src_test -- "${skip_params[@]}" -} +CARGO_SKIP_TESTS=( + # skip tests that fail in sandbox environment + test_gpg::gpgsm_signing_roundtrip + test_gpg::gpgsm_signing_roundtrip_explicit_key + test_gpg::gpgsm_unknown_key +) src_install() { pushd cli >/dev/null || die diff --git a/net-analyzer/rustscan/rustscan-2.4.1.ebuild b/net-analyzer/rustscan/rustscan-2.4.1.ebuild index e311c0d8537e0..0a9a094b00fe4 100644 --- a/net-analyzer/rustscan/rustscan-2.4.1.ebuild +++ b/net-analyzer/rustscan/rustscan-2.4.1.ebuild @@ -299,13 +299,13 @@ RDEPEND="nmap? ( net-analyzer/nmap )" src_test() { # those tests require the network if has network-sandbox ${FEATURES} ; then - local skip=( - --skip address::tests::parse_correct_host_addresses - --skip address::tests::parse_hosts_file_and_incorrect_hosts - --skip address::tests::resolver_args_google_dns - --skip address::tests::resolver_default_cloudflare + local CARGO_SKIP_TESTS=( + address::tests::parse_correct_host_addresses + address::tests::parse_hosts_file_and_incorrect_hosts + address::tests::resolver_args_google_dns + address::tests::resolver_default_cloudflare ) fi - cargo_src_test -- "${skip[@]}" + cargo_src_test } diff --git a/net-misc/hurl/hurl-7.0.0.ebuild b/net-misc/hurl/hurl-7.0.0.ebuild index 1f0ddd23e345f..2b8f382e7e0e2 100644 --- a/net-misc/hurl/hurl-7.0.0.ebuild +++ b/net-misc/hurl/hurl-7.0.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 2023-2025 Gentoo Authors +# Copyright 2023-2026 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # Autogenerated by pycargoebuild 0.10 @@ -236,9 +236,8 @@ src_install() { newfishcomp completions/hurlfmt.fish hurlfmt.fish } -src_test() { - # These need a local HTTP server.. and don't bother setting one up.. - cargo_src_test -- \ - --skip simple_sample \ - --skip runner::hurl_file::run -} +# These need a local HTTP server.. and don't bother setting one up.. +CARGO_SKIP_TESTS=( + simple_sample + runner::hurl_file::run +) diff --git a/sys-process/below/below-0.11.0-r1.ebuild b/sys-process/below/below-0.11.0-r1.ebuild index 03d1db500346e..68a2106263c32 100644 --- a/sys-process/below/below-0.11.0-r1.ebuild +++ b/sys-process/below/below-0.11.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 2023-2025 Gentoo Authors +# Copyright 2023-2026 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -304,14 +304,14 @@ src_configure() { } src_test() { - local skip=( - --skip disable_disk_stat - --skip advance_forward_and_reverse - --skip disable_io_stat - --skip record_replay_integration - --skip test_belowrc_to_event + local CARGO_SKIP_TESTS=( + disable_disk_stat + advance_forward_and_reverse + disable_io_stat + record_replay_integration + test_belowrc_to_event ) - cargo_src_test --workspace below -- "${skip[@]}" + cargo_src_test --workspace below } src_install() {