From 7a8af9e69dd9f17b0e22c06f7a67fb988b4a80a3 Mon Sep 17 00:00:00 2001 From: oech3 <79379754+oech3@users.noreply.github.com> Date: Sun, 1 Feb 2026 00:23:59 +0900 Subject: [PATCH] Additional hashsum cleanup --- src/uucore/src/lib/features/checksum/validate.rs | 2 +- tests/by-util/test_b2sum.rs | 9 --------- tests/by-util/test_md5sum.rs | 10 ---------- tests/by-util/test_sha1sum.rs | 9 --------- tests/by-util/test_sha224sum.rs | 10 ---------- tests/by-util/test_sha256sum.rs | 9 --------- tests/by-util/test_sha384sum.rs | 9 --------- tests/by-util/test_sha512sum.rs | 9 --------- util/build-gnu.sh | 4 ++-- 9 files changed, 3 insertions(+), 68 deletions(-) diff --git a/src/uucore/src/lib/features/checksum/validate.rs b/src/uucore/src/lib/features/checksum/validate.rs index 5c7aef4324b..68b0fbe9c92 100644 --- a/src/uucore/src/lib/features/checksum/validate.rs +++ b/src/uucore/src/lib/features/checksum/validate.rs @@ -456,7 +456,7 @@ impl LineInfo { /// In case of non-algo-based format, if `cached_line_format` is Some, it must take the priority /// over the detected format. Otherwise, we must set it the the detected format. /// This specific behavior is emphasized by the test - /// `test_hashsum::test_check_md5sum_only_one_space`. + /// `test_md5sum::test_check_md5sum_only_one_space`. fn parse(s: impl AsRef, cached_line_format: &mut Option) -> Option { let line_bytes = os_str_as_bytes(s.as_ref()).ok()?; diff --git a/tests/by-util/test_b2sum.rs b/tests/by-util/test_b2sum.rs index 9df3170e606..2bbc15a8c64 100644 --- a/tests/by-util/test_b2sum.rs +++ b/tests/by-util/test_b2sum.rs @@ -283,12 +283,3 @@ fn test_check_b2sum_strict_check() { .succeeds() .stdout_only(&output); } - -#[test] -fn test_help_shows_correct_utility_name() { - new_ucmd!() - .arg("--help") - .succeeds() - .stdout_contains("Usage: b2sum") - .stdout_does_not_contain("Usage: hashsum"); -} diff --git a/tests/by-util/test_md5sum.rs b/tests/by-util/test_md5sum.rs index 6ccf173cf15..a7c36704ff8 100644 --- a/tests/by-util/test_md5sum.rs +++ b/tests/by-util/test_md5sum.rs @@ -800,13 +800,3 @@ fn test_check_md5_comment_leading_space() { .stdout_contains("foo: OK") .stderr_contains("WARNING: 1 line is improperly formatted"); } - -#[test] -fn test_help_shows_correct_utility_name() { - // Test md5sum - new_ucmd!() - .arg("--help") - .succeeds() - .stdout_contains("Usage: md5sum") - .stdout_does_not_contain("Usage: hashsum"); -} diff --git a/tests/by-util/test_sha1sum.rs b/tests/by-util/test_sha1sum.rs index 6a540d509b1..3c71759402e 100644 --- a/tests/by-util/test_sha1sum.rs +++ b/tests/by-util/test_sha1sum.rs @@ -152,12 +152,3 @@ fn test_conflicting_arg() { new_ucmd!().arg("--tag").arg("--check").fails_with_code(1); new_ucmd!().arg("--tag").arg("--text").fails_with_code(1); } - -#[test] -fn test_help_shows_correct_utility_name() { - new_ucmd!() - .arg("--help") - .succeeds() - .stdout_contains("Usage: sha1sum") - .stdout_does_not_contain("Usage: hashsum"); -} diff --git a/tests/by-util/test_sha224sum.rs b/tests/by-util/test_sha224sum.rs index e2b7129b8a5..fa83ff7cceb 100644 --- a/tests/by-util/test_sha224sum.rs +++ b/tests/by-util/test_sha224sum.rs @@ -108,13 +108,3 @@ fn test_invalid_arg() { fn test_conflicting_arg() { new_ucmd!().arg("--tag").arg("--check").fails_with_code(1); } - -#[test] -fn test_help_shows_correct_utility_name() { - // Test that help output shows the actual utility name instead of "hashsum" - new_ucmd!() - .arg("--help") - .succeeds() - .stdout_contains("Usage: sha224sum") - .stdout_does_not_contain("Usage: hashsum"); -} diff --git a/tests/by-util/test_sha256sum.rs b/tests/by-util/test_sha256sum.rs index b8219e2382b..53eed6e2159 100644 --- a/tests/by-util/test_sha256sum.rs +++ b/tests/by-util/test_sha256sum.rs @@ -169,12 +169,3 @@ fn test_check_sha256_binary() { .no_stderr() .stdout_is("binary.png: OK\n"); } - -#[test] -fn test_help_shows_correct_utility_name() { - new_ucmd!() - .arg("--help") - .succeeds() - .stdout_contains("Usage: sha256sum") - .stdout_does_not_contain("Usage: hashsum"); -} diff --git a/tests/by-util/test_sha384sum.rs b/tests/by-util/test_sha384sum.rs index a579e041a68..bb2a0229af3 100644 --- a/tests/by-util/test_sha384sum.rs +++ b/tests/by-util/test_sha384sum.rs @@ -110,12 +110,3 @@ fn test_conflicting_arg() { new_ucmd!().arg("--tag").arg("--check").fails_with_code(1); new_ucmd!().arg("--tag").arg("--text").fails_with_code(1); } - -#[test] -fn test_help_shows_correct_utility_name() { - new_ucmd!() - .arg("--help") - .succeeds() - .stdout_contains("Usage: sha384sum") - .stdout_does_not_contain("Usage: hashsum"); -} diff --git a/tests/by-util/test_sha512sum.rs b/tests/by-util/test_sha512sum.rs index 08c6d20fe92..ca25e55c154 100644 --- a/tests/by-util/test_sha512sum.rs +++ b/tests/by-util/test_sha512sum.rs @@ -110,12 +110,3 @@ fn test_conflicting_arg() { new_ucmd!().arg("--tag").arg("--check").fails_with_code(1); new_ucmd!().arg("--tag").arg("--text").fails_with_code(1); } - -#[test] -fn test_help_shows_correct_utility_name() { - new_ucmd!() - .arg("--help") - .succeeds() - .stdout_contains("Usage: sha512sum") - .stdout_does_not_contain("Usage: hashsum"); -} diff --git a/util/build-gnu.sh b/util/build-gnu.sh index 0d1c6d9e114..70886e5e912 100755 --- a/util/build-gnu.sh +++ b/util/build-gnu.sh @@ -213,7 +213,7 @@ sed -i -e "s|---dis ||g" tests/tail/overlay-headers.sh # watchers before initial read, so no exact equivalent exists. We break at # watch_with_parent as the closest semantic match. -iex suppresses Rust debug # script auto-load warnings that would cause the test to skip. -"${SED}" -i \ +sed -i \ -e "s|break_src=\"\$abs_top_srcdir/src/tail.c\"|break_src=\"${path_UUTILS}/src/uu/tail/src/follow/watch.rs\"|" \ -e 's|break_line=$(grep -n ^tail_forever_inotify "$break_src")|break_line=$(grep -n "watcher_rx.watch_with_parent" "$break_src")|' \ -e 's|gdb -nx --batch-silent|gdb -nx --batch-silent -iex "set auto-load no"|g' \ @@ -316,7 +316,7 @@ echo "n_stat1 = \$n_stat1"\n\ echo "n_stat2 = \$n_stat2"\n\ test \$n_stat1 -ge \$n_stat2 \\' tests/ls/stat-free-color.sh -# no need to replicate this output with hashsum +# for clap sed -i -e "s|Try 'md5sum --help' for more information.\\\n||" tests/cksum/md5sum.pl # Our ls command always outputs ANSI color codes prepended with a zero. However,