diff --git a/.github/workflows/CICD.yml b/.github/workflows/CICD.yml index 624a7c2abd..d6cab08b16 100644 --- a/.github/workflows/CICD.yml +++ b/.github/workflows/CICD.yml @@ -199,6 +199,11 @@ jobs: # * ensure '.clippy.toml' MSRV configuration setting is equal to ${{ env.RUST_MIN_SRV }} CLIPPY_MSRV=$(grep -P "(?i)^\s*msrv\s*=\s*" .clippy.toml | grep -oP "\d+([.]\d+)+") if [ "${CLIPPY_MSRV}" != "${{ env.RUST_MIN_SRV }}" ]; then { echo "::error file=.clippy.toml::Incorrect MSRV configuration for clippy (found '${CLIPPY_MSRV}'; should be '${{ env.RUST_MIN_SRV }}'); update '.clippy.toml' with 'msrv = \"${{ env.RUST_MIN_SRV }}\"'" ; exit 1 ; } ; fi + - name: Install/setup prerequisites + shell: bash + run: | + # Install a package for one of the tests + sudo apt-get -y update ; sudo apt-get -y install attr - name: Info shell: bash run: | diff --git a/tests/by-util/test_cp.rs b/tests/by-util/test_cp.rs index 634288b27b..19fbc5ca71 100644 --- a/tests/by-util/test_cp.rs +++ b/tests/by-util/test_cp.rs @@ -5939,13 +5939,12 @@ fn test_cp_preserve_xattr_readonly_source() { at.touch(source_file); let xattr_key = "user.test"; - let xattr_value = "value"; match Command::new("setfattr") .args([ "-n", xattr_key, "-v", - xattr_value, + "value", &at.plus_as_string(source_file), ]) .status() @@ -5975,8 +5974,9 @@ fn test_cp_preserve_xattr_readonly_source() { let stdout = String::from_utf8_lossy(&getfattr_output.stdout); assert!( - stdout.contains("user.test"), - "Expected 'user.test' not found in getfattr output:\n{}", + stdout.contains(xattr_key), + "Expected '{}' not found in getfattr output:\n{}", + xattr_key, stdout );