Skip to content

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

Closed
mattsu2020 wants to merge 7 commits intouutils:mainfrom
mattsu2020:rm_compatibility
Closed

rm: fix gnu coreutils test one-file-system.sh#9428
mattsu2020 wants to merge 7 commits intouutils:mainfrom
mattsu2020:rm_compatibility

Conversation

@mattsu2020
Copy link
Copy Markdown
Contributor

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
Copy link
Copy Markdown

GNU testsuite comparison:

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

Comment thread src/uu/rm/locales/en-US.ftl
Comment thread tests/by-util/test_rm.rs Outdated
@github-actions
Copy link
Copy Markdown

GNU testsuite comparison:

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

Comment thread src/uu/rm/src/rm.rs Outdated
@github-actions
Copy link
Copy Markdown

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
Copy link
Copy Markdown

github-actions Bot commented Dec 1, 2025

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!

1 similar comment
@github-actions
Copy link
Copy Markdown

github-actions Bot commented Dec 2, 2025

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
Copy link
Copy Markdown

codspeed-hq Bot commented Dec 15, 2025

CodSpeed Performance Report

Merging #9428 will not alter performance

Comparing mattsu2020:rm_compatibility (1f09776) with main (1eea517)

Summary

✅ 136 untouched
⏩ 24 skipped1

Footnotes

  1. 24 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
Copy link
Copy Markdown

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
Copy link
Copy Markdown

GNU testsuite comparison:

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

Comment thread src/uu/rm/src/rm.rs
Comment thread src/uu/rm/src/rm.rs Outdated
Comment thread src/uu/rm/src/rm.rs Outdated
Comment thread src/uu/rm/src/platform/linux.rs Outdated
@sylvestre
Copy link
Copy Markdown
Contributor

i see 3 conflicts

@github-actions
Copy link
Copy Markdown

GNU testsuite comparison:

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

@github-actions
Copy link
Copy Markdown

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
Copy link
Copy Markdown

GNU testsuite comparison:

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

3 similar comments
@github-actions
Copy link
Copy Markdown

GNU testsuite comparison:

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

@github-actions
Copy link
Copy Markdown

GNU testsuite comparison:

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

@github-actions
Copy link
Copy Markdown

GNU testsuite comparison:

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

Comment thread src/uu/date/src/locale.rs Outdated
Comment thread src/uucore/src/lib/features/uptime.rs Outdated
@mattsu2020 mattsu2020 marked this pull request as draft December 31, 2025 00:35
@github-actions
Copy link
Copy Markdown

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!

@github-actions
Copy link
Copy Markdown

GNU testsuite comparison:

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

@github-actions
Copy link
Copy Markdown

GNU testsuite comparison:

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

@mattsu2020 mattsu2020 marked this pull request as ready for review December 31, 2025 03:22
Comment thread src/uu/rm/src/rm.rs Outdated
Comment thread src/uu/rm/src/rm.rs Outdated
Comment thread src/uu/rm/src/rm.rs Outdated
Comment thread src/uu/rm/src/rm.rs Outdated
@github-actions
Copy link
Copy Markdown

github-actions Bot commented Jan 1, 2026

GNU testsuite comparison:

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

@github-actions
Copy link
Copy Markdown

github-actions Bot commented Jan 1, 2026

GNU testsuite comparison:

GNU test failed: tests/tty/tty-eof. tests/tty/tty-eof is passing on 'main'. Maybe you have to rebase?
Congrats! The gnu test tests/rm/one-file-system is no longer failing!

@mattsu2020 mattsu2020 requested a review from sylvestre January 5, 2026 10:38
Add "tmpfs" to the spell-checker ignore comment in test_rm.rs to suppress warnings for this filesystem type term used in the tests.
…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
…unction

Remove the cfg-specific `should_skip_different_device` wrapper and directly call
`should_skip_different_device_with_dev` with a `#[cfg(unix)]` attribute in the
recursive directory removal function, reducing code duplication and improving clarity.
Remove wrapper functions `remove_dir_recursive` and `remove_dir_recursive_with_parent`, and inline conditional compilation directly in `handle_dir_impl` to reduce code duplication and improve maintainability without altering functionality.
Add conditional compilation to discard `parent_dev_id` parameter when not on Unix, preventing compiler warnings since this parameter is unused outside Unix-specific code paths.
@mattsu2020 mattsu2020 marked this pull request as draft January 15, 2026 11:49
@mattsu2020 mattsu2020 closed this Jan 23, 2026
@mattsu2020 mattsu2020 deleted the rm_compatibility branch January 23, 2026 12:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants