blockworks-foundation
/
solana
mirror of https://github.com/blockworks-foundation/solana.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

This commit is contained in:
Jack May 2021-04-07 17:22:55 -07:00 committed by GitHub
parent 388ce12207
commit 878e52f0b9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ci/test-stable.sh
View File

@ -44,14 +44,10 @@ test-stable-perf)
./cargo-build-bpf --manifest-path sdk/Cargo.toml
# BPF Program unit tests
for program in programs/bpf/rust/*; do
if [ -d "${program}" ]; then
_ "$cargo" test --manifest-path "$program"/Cargo.toml
_ cargo-build-bpf --manifest-path "$program"/Cargo.toml --bpf-sdk sdk/bpf
fi
done
"$cargo" test --manifest-path programs/bpf/Cargo.toml
cargo-build-bpf --manifest-path programs/bpf/Cargo.toml --bpf-sdk sdk/bpf
# BPF program tests
# BPF program system tests
_ make -C programs/bpf/c tests
_ "$cargo" stable test \
--manifest-path programs/bpf/Cargo.toml \

10
sdk/cargo-build-bpf/src/main.rs
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<_>>();

10
sdk/cargo-test-bpf/src/main.rs
View File

@ -152,8 +152,14 @@ fn test_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<_>>();