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

cargo-test-bpf now sets the "test-bpf" feature for crate tests (#13447)

Browse Source 
The feature allows for tests to distinguish between `cargo test` and
`cargo test-bpf` primarily for the purpose of excluding CPI tests that
require the system program under `cargo test`, as the path to enabling
CPI in `cargo test`-based testing is unclear

(cherry picked from commit 1a70a2a25b)

Co-authored-by: Michael Vines <mvines@gmail.com>
This commit is contained in:
mergify[bot]
2020-11-06 19:39:18 +00:00
committed by GitHub
parent 98e9f34704
commit 6d4f6e79b0
2 changed files with 32 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -74,6 +74,15 @@ fn test_bpf(config: Config) {
exit(1);
});
let root_package = metadata.root_package().unwrap_or_else(|| {
eprintln!(
"Workspace does not have a root package: {}",
metadata.workspace_root.display()
);
exit(1);
});
let set_test_bpf_feature = root_package.features.contains_key("test-bpf");
let bpf_out_dir = config
.bpf_out_dir
.unwrap_or_else(|| format!("{}", metadata.target_directory.join("deploy").display()));
@@ -108,6 +117,13 @@ fn test_bpf(config: Config) {
env::set_var("BPF_OUT_DIR", bpf_out_dir);
cargo_args.insert(0, "test");
// If the program crate declares the "test-bpf" feature, pass it along to the tests so they can
// distinguish between `cargo test` and `cargo test-bpf`
if set_test_bpf_feature {
cargo_args.push("--features");
cargo_args.push("test-bpf");
}
for extra_cargo_test_arg in &config.extra_cargo_test_args {
cargo_args.push(&extra_cargo_test_arg);
}