diff --git a/tss-esapi-sys/build.rs b/tss-esapi-sys/build.rs index ff1e854f..bd4100c4 100644 --- a/tss-esapi-sys/build.rs +++ b/tss-esapi-sys/build.rs @@ -466,11 +466,11 @@ pub mod tpm2_tss { .filter(|file| { file.extension() .and_then(|ext| ext.to_str()) - .map_or(false, |file_ext| ["so", "lib"].contains(&file_ext)) + .is_some_and(|file_ext| ["so", "lib"].contains(&file_ext)) && file .file_stem() .and_then(|stem| stem.to_str()) - .map_or(false, |file_name| file_name.contains(lib_name)) + .is_some_and(|file_name| file_name.contains(lib_name)) }) .peekable(); diff --git a/tss-esapi/tests/valgrind.sh b/tss-esapi/tests/valgrind.sh index 8775510b..6eede9cb 100755 --- a/tss-esapi/tests/valgrind.sh +++ b/tss-esapi/tests/valgrind.sh @@ -22,6 +22,7 @@ tpm2_startup -c -T mssim ########################## # Install cargo-valgrind # ########################## +apt update apt install -y valgrind cargo install cargo-valgrind