gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add cargo-test-bpf

Browse Source
This commit is contained in:
Michael Vines
2020-11-04 18:29:26 -08:00
parent 78c2d9156b
commit 6c36a2085f
7 changed files with 255 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
sdk/cargo-build-bpf/src/main.rs
View File

@ -11,12 +11,13 @@ use std::{
};
struct Config {
bpf_sdk: PathBuf,
bpf_out_dir: Option<PathBuf>,
bpf_sdk: PathBuf,
dump: bool,
features: Vec<String>,
manifest_path: Option<PathBuf>,
no_default_features: bool,
verbose: bool,
}
impl Default for Config {
@ -29,10 +30,11 @@ impl Default for Config {
.to_path_buf()
.join("sdk/bpf"),
bpf_out_dir: None,
dump: false,
features: vec![],
manifest_path: None,
no_default_features: false,
dump: true,
verbose: false,
}
}
}
@ -152,22 +154,25 @@ fn build_bpf(config: Config) {
}
let xargo_build = config.bpf_sdk.join("rust/xargo-build.sh");
let mut spawn_args = vec![];
let mut xargo_build_args = vec![];
if config.no_default_features {
spawn_args.push("--no-default-features");
xargo_build_args.push("--no-default-features");
}
for feature in &config.features {
spawn_args.push("--features");
spawn_args.push(feature);
xargo_build_args.push("--features");
xargo_build_args.push(feature);
}
if legacy_program_feature_present {
if !config.no_default_features {
spawn_args.push("--no-default-features");
xargo_build_args.push("--no-default-features");
}
spawn_args.push("--features=program");
xargo_build_args.push("--features=program");
}
spawn(&config.bpf_sdk.join(xargo_build), &spawn_args);
if config.verbose {
xargo_build_args.push("--verbose");
}
spawn(&config.bpf_sdk.join(xargo_build), &xargo_build_args);
if let Some(program_name) = program_name {
let program_unstripped_so = target_build_directory.join(&format!("{}.so", program_name));
@ -224,6 +229,13 @@ fn main() {
.takes_value(false)
.help("Dump ELF information to a text file on success"),
)
.arg(
Arg::with_name("verbose")
.short("v")
.long("verbose")
.takes_value(false)
.help("Use verbose output"),
)
.arg(
Arg::with_name("features")
.long("features")
@ -281,6 +293,7 @@ fn main() {
.unwrap_or_else(Vec::new),
manifest_path: value_t!(matches, "manifest_path", PathBuf).ok(),
no_default_features: matches.is_present("no_default_features"),
verbose: matches.is_present("verbose"),
};
build_bpf(config);
}