Fix cargo-build/test-bpf --workspace (bp #16431) (#16432)

* Fix cargo-build/test-bpf --workspace (#16431)

(cherry picked from commit 878e52f0b9)

# Conflicts:
#	ci/test-stable.sh

* resolve conflicts

Co-authored-by: Jack May <jack@solana.com>
This commit is contained in:
mergify[bot]
2021-04-08 16:55:21 +00:00
committed by GitHub
parent a001c1c8f6
commit 6234090361
4 changed files with 21 additions and 6 deletions

View File

@@ -401,8 +401,14 @@ fn build_bpf(config: Config, manifest_path: Option<PathBuf>) {
.packages
.iter()
.filter(|package| {
package.manifest_path.with_file_name("Xargo.toml").exists()
&& metadata.workspace_members.contains(&package.id)
if metadata.workspace_members.contains(&package.id) {
for target in package.targets.iter() {
if target.kind.contains(&"cdylib".to_string()) {
return true;
}
}
}
false
})
.collect::<Vec<_>>();