From aafdf10dc82e6744ee7bd7fafcc19ec619b9c40d Mon Sep 17 00:00:00 2001 From: Terts Diepraam Date: Wed, 10 Jan 2024 14:03:53 +0100 Subject: [PATCH 1/2] CI: test uucore with coreutils to run it with the proper features --- .github/workflows/CICD.yml | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/.github/workflows/CICD.yml b/.github/workflows/CICD.yml index ea369e4ef..df1a5fa50 100644 --- a/.github/workflows/CICD.yml +++ b/.github/workflows/CICD.yml @@ -994,16 +994,8 @@ jobs: UTILITY_LIST="$(./util/show-utils.sh ${{ steps.vars.outputs.CARGO_FEATURES_OPTION }})" CARGO_UTILITY_LIST_OPTIONS="$(for u in ${UTILITY_LIST}; do echo -n "-puu_${u} "; done;)" outputs CARGO_UTILITY_LIST_OPTIONS - - name: Test uucore - run: cargo nextest run --profile ci --hide-progress-bar -p uucore - env: - RUSTC_WRAPPER: "" - RUSTFLAGS: "-Zprofile -Ccodegen-units=1 -Copt-level=0 -Clink-dead-code -Coverflow-checks=off -Zpanic_abort_tests -Cpanic=abort" - RUSTDOCFLAGS: "-Cpanic=abort" - RUST_BACKTRACE: "1" - # RUSTUP_TOOLCHAIN: ${{ steps.vars.outputs.TOOLCHAIN }} - name: Test - run: cargo nextest run --profile ci --hide-progress-bar ${{ steps.vars.outputs.CARGO_FEATURES_OPTION }} + run: cargo nextest run --profile ci --hide-progress-bar ${{ steps.vars.outputs.CARGO_FEATURES_OPTION }} -p uucore -p coreutils env: RUSTC_WRAPPER: "" RUSTFLAGS: "-Zprofile -Ccodegen-units=1 -Copt-level=0 -Clink-dead-code -Coverflow-checks=off -Zpanic_abort_tests -Cpanic=abort" From 61de1dc23ac055237789bf3d54e86eda85af4984 Mon Sep 17 00:00:00 2001 From: Terts Diepraam Date: Wed, 17 Jan 2024 10:44:33 +0100 Subject: [PATCH 2/2] uucore/sum: fix crlf test --- src/uucore/src/lib/features/sum.rs | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/uucore/src/lib/features/sum.rs b/src/uucore/src/lib/features/sum.rs index e079d7a30..3a8bb55d5 100644 --- a/src/uucore/src/lib/features/sum.rs +++ b/src/uucore/src/lib/features/sum.rs @@ -484,22 +484,23 @@ mod tests { fn test_crlf_across_blocks() { use std::io::Write; - use crate::digest::Digest; - use crate::digest::DigestWriter; + use super::Digest; + use super::DigestWriter; + use super::Md5; // Writing "\r" in one call to `write()`, and then "\n" in another. - let mut digest = Box::new(md5::Md5::new()) as Box; + let mut digest = Box::new(Md5::new()) as Box; let mut writer_crlf = DigestWriter::new(&mut digest, false); writer_crlf.write_all(&[b'\r']).unwrap(); writer_crlf.write_all(&[b'\n']).unwrap(); - writer_crlf.hash_finalize(); + writer_crlf.finalize(); let result_crlf = digest.result_str(); // We expect "\r\n" to be replaced with "\n" in text mode on Windows. - let mut digest = Box::new(md5::Md5::new()) as Box; + let mut digest = Box::new(Md5::new()) as Box; let mut writer_lf = DigestWriter::new(&mut digest, false); writer_lf.write_all(&[b'\n']).unwrap(); - writer_lf.hash_finalize(); + writer_lf.finalize(); let result_lf = digest.result_str(); assert_eq!(result_crlf, result_lf);