rm: fix gnu coreutils test one-file-system.sh #9428

mattsu2020 · 2025-11-20T23:47:49Z

Summary

Remove the extra leading rm: from the rm-error-preserve-root-all locale strings so the message matches expected test output.
Keep wording otherwise unchanged across en-US and fr-FR locales.

#9127

github-actions · 2025-11-21T00:10:42Z

GNU testsuite comparison:

Congrats! The gnu test tests/rm/one-file-system is no longer failing!

sylvestre · 2025-11-21T22:20:48Z

src/uu/rm/locales/en-US.ftl

 rm-error-dangerous-recursive-operation = it is dangerous to operate recursively on '/'
 rm-error-use-no-preserve-root = use --no-preserve-root to override this failsafe
 rm-error-refusing-to-remove-directory = refusing to remove '.' or '..' directory: skipping '{$path}'
+rm-error-skipping-directory-on-different-device = skipping '{$path}', since it's on a different device


this isn't in the french file

sylvestre · 2025-11-21T22:24:45Z

tests/by-util/test_rm.rs

+    at.mkdir_all(a_b);
+    at.mkdir_all(t_y);
+
+    #[cfg(any(target_os = "linux", target_os = "macos"))]


can you do one function for linux
and another for macos ?
it is too hard to understand correctly

Improved readability

github-actions · 2025-11-21T23:54:03Z

GNU testsuite comparison:

Congrats! The gnu test tests/rm/one-file-system is no longer failing!

sylvestre · 2025-11-22T08:25:08Z

src/uu/rm/src/rm.rs


        // Recursive case: this is a directory.
        let mut error = false;
+        #[cfg(unix)]


dup code from line 665

github-actions · 2025-11-22T09:48:26Z

GNU testsuite comparison:

Skipping an intermittent issue tests/tail/overlay-headers (passes in this run but fails in the 'main' branch)
Congrats! The gnu test tests/rm/one-file-system is no longer failing!

github-actions · 2025-12-01T13:51:42Z

GNU testsuite comparison:

Skip an intermittent issue tests/misc/tee (fails in this run but passes in the 'main' branch)
Congrats! The gnu test tests/rm/one-file-system is no longer failing!

github-actions · 2025-12-02T12:22:13Z

GNU testsuite comparison:

Skip an intermittent issue tests/misc/tee (fails in this run but passes in the 'main' branch)
Congrats! The gnu test tests/rm/one-file-system is no longer failing!

codspeed-hq · 2025-12-15T12:21:48Z

CodSpeed Performance Report

Merging #9428 will not alter performance

_{Comparing mattsu2020:rm_compatibility (71cc702) with main (d97bc73)}

Summary

✅ 136 untouched
⏩ 6 skipped¹

6 benchmarks were skipped, so the baseline results were used instead. If they were deleted from the codebase, click here and archive them to remove them from the performance reports. ↩

github-actions · 2025-12-15T12:25:15Z

GNU testsuite comparison:

Skipping an intermittent issue tests/tail/overlay-headers (passes in this run but fails in the 'main' branch)
Congrats! The gnu test tests/rm/one-file-system is no longer failing!

github-actions · 2025-12-24T12:16:27Z

GNU testsuite comparison:

Congrats! The gnu test tests/rm/one-file-system is no longer failing!

sylvestre · 2025-12-26T23:55:06Z

src/uu/rm/src/rm.rs

        },
        one_fs: matches.get_flag(OPT_ONE_FILE_SYSTEM),
        preserve_root: !matches.get_flag(OPT_NO_PRESERVE_ROOT),
+        preserve_root_all: matches


please fix clippy here

sylvestre · 2025-12-26T23:55:38Z

src/uu/rm/src/rm.rs

+    _parent_dev_id: Option<u64>,
 ) -> bool {
+    #[cfg(unix)]
+    let parent_dev_id = _parent_dev_id;


i am not a fan of the _parent_dev_id usage
please make it optional instead

sylvestre · 2025-12-26T23:56:26Z

src/uu/rm/src/rm.rs

+    #[cfg(unix)]
+    let parent_dev_id = _parent_dev_id;
+
+    let metadata = match path.symlink_metadata() {


you can use unwrap_or_else instead

sylvestre · 2025-12-26T23:57:45Z

src/uu/rm/src/platform/linux.rs


        if is_dir {
+            if check_device {
+                if let Some(parent_dev_id) = parent_dev_id {


quite duplicated from line 649

sylvestre · 2025-12-27T10:22:23Z

i see 3 conflicts

github-actions · 2025-12-27T10:54:38Z

GNU testsuite comparison:

Congrats! The gnu test tests/rm/one-file-system is no longer failing!

github-actions · 2025-12-27T11:21:13Z

GNU testsuite comparison:

Skipping an intermittent issue tests/timeout/timeout (passes in this run but fails in the 'main' branch)
Congrats! The gnu test tests/rm/one-file-system is no longer failing!
Congrats! The gnu test tests/tail/follow-name is no longer failing!

github-actions · 2025-12-27T11:42:27Z

GNU testsuite comparison:

Congrats! The gnu test tests/rm/one-file-system is no longer failing!

github-actions · 2025-12-27T12:24:36Z

GNU testsuite comparison:

Congrats! The gnu test tests/rm/one-file-system is no longer failing!

github-actions · 2025-12-27T13:00:20Z

GNU testsuite comparison:

Congrats! The gnu test tests/rm/one-file-system is no longer failing!

github-actions · 2025-12-29T02:15:03Z

GNU testsuite comparison:

Congrats! The gnu test tests/rm/one-file-system is no longer failing!

sylvestre · 2025-12-30T23:00:55Z

src/uu/date/src/locale.rs

    cfg_langinfo! {
        use super::*;

+        fn has_date_component(format: &str) -> bool {


i think it is unrelated to the rm change no?

sylvestre · 2025-12-30T23:01:11Z

src/uucore/src/lib/features/uptime.rs

 use crate::error::{UError, UResult};
 use crate::translate;
 use chrono::Local;
+use fluent::FluentArgs;


same, unrelated ?

github-actions · 2025-12-31T01:14:37Z

GNU testsuite comparison:

Congrats! The gnu test tests/rm/one-file-system is no longer failing!
Congrats! The gnu test tests/tty/tty-eof is no longer failing!

Add "tmpfs" to the spell-checker ignore comment in test_rm.rs to suppress warnings for this filesystem type term used in the tests.

github-actions · 2025-12-31T02:40:20Z

GNU testsuite comparison:

Congrats! The gnu test tests/tty/tty-eof is no longer failing!

…e_root_all - Changed preserve_root_all to retrieve device ID from parent directory's symlink metadata instead of file's metadata - Maintains one_fs option using file's metadata - Improves accuracy for preserving root directory across filesystems on Unix systems

github-actions · 2025-12-31T03:02:32Z

GNU testsuite comparison:

Congrats! The gnu test tests/rm/one-file-system is no longer failing!

sylvestre · 2025-12-31T20:22:40Z

src/uu/rm/src/rm.rs

 }

+#[cfg(unix)]
+fn should_skip_different_device(


this function should be removed
should_skip_different_device_with_dev should be called directly

sylvestre · 2025-12-31T20:23:31Z

src/uu/rm/src/rm.rs

+    progress_bar: Option<&ProgressBar>,
+    parent_dev_id: Option<u64>,
+) -> bool {
+    remove_dir_recursive_impl(path, options, progress_bar, parent_dev_id)


same, not a very interesting function

sylvestre · 2025-12-31T20:23:35Z

src/uu/rm/src/rm.rs

+    options: &Options,
+    progress_bar: Option<&ProgressBar>,
+) -> bool {
+    remove_dir_recursive_impl(path, options, progress_bar, None)


sylvestre · 2025-12-31T20:23:41Z

src/uu/rm/src/rm.rs

+    progress_bar: Option<&ProgressBar>,
+    parent_dev_id: Option<u64>,
+) -> bool {
+    remove_dir_recursive(path, options, progress_bar, parent_dev_id)


sylvestre reviewed Nov 21, 2025

View reviewed changes

sylvestre reviewed Nov 22, 2025

View reviewed changes

sylvestre reviewed Dec 26, 2025

View reviewed changes

sylvestre reviewed Dec 30, 2025

View reviewed changes

mattsu2020 force-pushed the rm_compatibility branch from d8875f6 to 0da3869 Compare December 31, 2025 00:34

mattsu2020 marked this pull request as draft December 31, 2025 00:35

feat(rm): implement --one-file-system and --preserve-root=all

fe51531

mattsu2020 force-pushed the rm_compatibility branch from 0da3869 to fe51531 Compare December 31, 2025 02:19

chore(tests/rm): add tmpfs to spell-checker ignore list

f3feef5

Add "tmpfs" to the spell-checker ignore comment in test_rm.rs to suppress warnings for this filesystem type term used in the tests.

mattsu2020 marked this pull request as ready for review December 31, 2025 03:22

sylvestre reviewed Dec 31, 2025

View reviewed changes

Uh oh!

rm: fix gnu coreutils test one-file-system.sh #9428

Are you sure you want to change the base?

rm: fix gnu coreutils test one-file-system.sh #9428

Conversation

mattsu2020 commented Nov 20, 2025

Summary

Uh oh!

github-actions bot commented Nov 21, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

github-actions bot commented Nov 21, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

github-actions bot commented Nov 22, 2025

Uh oh!

github-actions bot commented Dec 1, 2025

Uh oh!

github-actions bot commented Dec 2, 2025

Uh oh!

codspeed-hq bot commented Dec 15, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Merging #9428 will not alter performance

Summary

Footnotes

Uh oh!

github-actions bot commented Dec 15, 2025

Uh oh!

github-actions bot commented Dec 24, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

sylvestre commented Dec 27, 2025

Uh oh!

github-actions bot commented Dec 27, 2025

Uh oh!

github-actions bot commented Dec 27, 2025

Uh oh!

github-actions bot commented Dec 27, 2025

Uh oh!

github-actions bot commented Dec 27, 2025

Uh oh!

github-actions bot commented Dec 27, 2025

Uh oh!

github-actions bot commented Dec 29, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

github-actions bot commented Dec 31, 2025

Uh oh!

github-actions bot commented Dec 31, 2025

Uh oh!

codspeed-hq bot commented Dec 15, 2025 •

edited

Loading