commit: badde5b62d4cacf026081dced8da46396f99e474 Author: Michael Mair-Keimberger <mm1ke <AT> gentoo <DOT> org> AuthorDate: Mon Nov 24 16:43:02 2025 +0000 Commit: Michael Mair-Keimberger <mm1ke <AT> gentoo <DOT> org> CommitDate: Mon Nov 24 16:43:02 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=badde5b6
sys-apps/uutils-coreutils: remove unused patch(es) Signed-off-by: Michael Mair-Keimberger <mm1ke <AT> gentoo.org> .../files/uutils-coreutils-0.0.28-cow-tests.patch | 27 -------- .../uutils-coreutils-0.2.27-xfail-tests.patch | 79 ---------------------- 2 files changed, 106 deletions(-) diff --git a/sys-apps/uutils-coreutils/files/uutils-coreutils-0.0.28-cow-tests.patch b/sys-apps/uutils-coreutils/files/uutils-coreutils-0.0.28-cow-tests.patch deleted file mode 100644 index 0e40b36d3fd9..000000000000 --- a/sys-apps/uutils-coreutils/files/uutils-coreutils-0.0.28-cow-tests.patch +++ /dev/null @@ -1,27 +0,0 @@ -https://github.com/uutils/coreutils/issues/6456 ---- a/tests/by-util/test_cp.rs -+++ b/tests/by-util/test_cp.rs -@@ -2489,6 +2489,7 @@ fn test_cp_sparse_never_empty() { - #[cfg(any(target_os = "linux", target_os = "android"))] - #[test] - fn test_cp_sparse_always_empty() { -+ return; - const BUFFER_SIZE: usize = 4096 * 4; - for argument in ["--sparse=always", "--sparse=alway", "--sparse=al"] { - let (at, mut ucmd) = at_and_ucmd!(); -@@ -2509,6 +2510,7 @@ fn test_cp_sparse_always_empty() { - #[cfg(any(target_os = "linux", target_os = "android"))] - #[test] - fn test_cp_sparse_always_non_empty() { -+ return; - const BUFFER_SIZE: usize = 4096 * 16 + 3; - let (at, mut ucmd) = at_and_ucmd!(); - -@@ -4198,6 +4200,7 @@ fn test_cp_default_virtual_file() { - #[test] - #[cfg(any(target_os = "linux", target_os = "android"))] - fn test_cp_debug_reflink_auto_sparse_always_non_sparse_file_with_long_zero_sequence() { -+ return; - let ts = TestScenario::new(util_name!()); - - let buf: Vec<u8> = vec![0; 4096 * 4]; diff --git a/sys-apps/uutils-coreutils/files/uutils-coreutils-0.2.27-xfail-tests.patch b/sys-apps/uutils-coreutils/files/uutils-coreutils-0.2.27-xfail-tests.patch deleted file mode 100644 index afd0ef872147..000000000000 --- a/sys-apps/uutils-coreutils/files/uutils-coreutils-0.2.27-xfail-tests.patch +++ /dev/null @@ -1,79 +0,0 @@ -See also: https://github.com/uutils/coreutils/issues/4946 ---- a/tests/by-util/test_install.rs -+++ b/tests/by-util/test_install.rs -@@ -1434,6 +1434,7 @@ fn test_install_dir_dot() { - // To match tests/install/d-slashdot.sh - let scene = TestScenario::new(util_name!()); - -+ /* - scene.ucmd().arg("-d").arg("dir1/.").succeeds(); - scene.ucmd().arg("-d").arg("dir2/..").succeeds(); - // Tests that we don't have dir3/. in the output -@@ -1466,7 +1467,7 @@ fn test_install_dir_dot() { - assert!(at.dir_exists("dir2")); - assert!(at.dir_exists("dir3")); - assert!(at.dir_exists("dir4/cal")); -- assert!(at.dir_exists("dir5/cali")); -+ assert!(at.dir_exists("dir5/cali"));*/ - } - - #[test] ---- a/tests/by-util/test_pinky.rs -+++ b/tests/by-util/test_pinky.rs -@@ -110,5 +110,5 @@ fn test_no_flag() { - let expect = unwrap_or_return!(expected_result(&ts, &[])).stdout_move_str(); - let v_actual: Vec<&str> = actual.split_whitespace().collect(); - let v_expect: Vec<&str> = expect.split_whitespace().collect(); -- assert_eq!(v_actual, v_expect); -+ /* assert_eq!(v_actual, v_expect); */ - } ---- a/tests/by-util/test_tail.rs -+++ b/tests/by-util/test_tail.rs -@@ -1543,6 +1543,8 @@ fn test_retry9() { - // Ensure that inotify will switch to polling mode if directory - // of the watched file was removed and recreated. - -+ return; -+ - use text::BACKEND; - - let ts = TestScenario::new(util_name!()); ---- a/tests/test_util_name.rs -+++ b/tests/test_util_name.rs -@@ -23,9 +23,9 @@ fn execution_phrase_double() { - .arg("--some-invalid-arg") - .output() - .unwrap(); -- assert!(String::from_utf8(output.stderr) -+ /*assert!(String::from_utf8(output.stderr) - .unwrap() -- .contains(&format!("Usage: {} ls", scenario.bin_path.display(),))); -+ .contains(&format!("Usage: {} ls", scenario.bin_path.display(),)));*/ - } - - #[test] -@@ -41,10 +41,10 @@ fn execution_phrase_single() { - .output() - .unwrap(); - dbg!(String::from_utf8(output.stderr.clone()).unwrap()); -- assert!(String::from_utf8(output.stderr).unwrap().contains(&format!( -+ /*assert!(String::from_utf8(output.stderr).unwrap().contains(&format!( - "Usage: {}", - scenario.fixtures.plus("uu-ls").display() -- ))); -+ )));*/ - } - - #[test] -diff --git a/tests/by-util/test_tail.rs b/tests/by-util/test_tail.rs -index 5680e31..66c4e19 100644 ---- a/tests/by-util/test_tail.rs -+++ b/tests/by-util/test_tail.rs -@@ -1983,6 +1983,7 @@ fn test_follow_name_truncate3() { - #[test] - #[cfg(all(not(target_vendor = "apple"), not(target_os = "windows")))] // FIXME: for currently not working platforms - fn test_follow_name_truncate4() { -+ return; - // Truncating a file with the same content it already has should not trigger a truncate event - - let ts = TestScenario::new(util_name!());
