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

Fix bpf unit test linkage (#9780) 

automerge
This commit is contained in:
Jack May 2020-04-28 19:41:08 -07:00 committed by GitHub
parent a4fe11fad2
commit d836dfff14
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
programs/bpf/Cargo.lock generated
View File

@ -1827,16 +1827,16 @@ dependencies = [
[[package]]
name = "solana-bpf-rust-invoke"
version = "1.0.0"
version = "1.2.0"
dependencies = [
"solana-bpf-rust-invoked 1.0.0",
"solana-bpf-rust-invoked 1.2.0",
"solana-sdk 1.2.0",
"solana-sdk-bpf-test 1.2.0",
]
[[package]]
name = "solana-bpf-rust-invoked"
version = "1.0.0"
version = "1.2.0"
dependencies = [
"solana-sdk 1.2.0",
"solana-sdk-bpf-test 1.2.0",

11
programs/bpf/rust/invoke/Cargo.toml
View File

@ -3,7 +3,7 @@
[package]
name = "solana-bpf-rust-invoke"
version = "1.0.0"
version = "1.2.0"
description = "Solana BPF test program written in Rust"
authors = ["Solana Maintainers <maintainers@solana.com>"]
repository = "https://github.com/solana-labs/solana"
@ -12,11 +12,9 @@ homepage = "https://solana.com/"
edition = "2018"
[dependencies]
solana-sdk = { path = "../../../../sdk/", version = "1.0.0", default-features = false }
solana-bpf-rust-invoked = { path = "../invoked"}
[dev_dependencies]
solana-sdk-bpf-test = { path = "../../../../sdk/bpf/rust/test", version = "1.0.0" }
solana-sdk = { path = "../../../../sdk/", version = "1.2.0", default-features = false }
solana-sdk-bpf-test = { path = "../../../../sdk/bpf/rust/test", version = "1.2.0" }
[features]
program = ["solana-sdk/program"]
@ -25,3 +23,6 @@ default = ["program"]
[lib]
name = "solana_bpf_rust_invoke"
crate-type = ["cdylib"]
[package.metadata.docs.rs]
targets = ["x86_64-unknown-linux-gnu"]

2
programs/bpf/rust/invoke/src/lib.rs
View File

@ -143,3 +143,5 @@ fn process_instruction(
Ok(())
}
solana_sdk_bpf_test::stubs!();

11
programs/bpf/rust/invoked/Cargo.toml
View File

@ -3,7 +3,7 @@
[package]
name = "solana-bpf-rust-invoked"
version = "1.0.0"
version = "1.2.0"
description = "Solana BPF test program written in Rust"
authors = ["Solana Maintainers <maintainers@solana.com>"]
repository = "https://github.com/solana-labs/solana"
@ -12,10 +12,8 @@ homepage = "https://solana.com/"
edition = "2018"
[dependencies]
solana-sdk = { path = "../../../../sdk/", version = "1.0.0", default-features = false }
[dev_dependencies]
solana-sdk-bpf-test = { path = "../../../../sdk/bpf/rust/test", version = "1.0.0" }
solana-sdk = { path = "../../../../sdk/", version = "1.2.0", default-features = false }
solana-sdk-bpf-test = { path = "../../../../sdk/bpf/rust/test", version = "1.2.0" }
[features]
program = ["solana-sdk/program"]
@ -24,3 +22,6 @@ default = ["program"]
[lib]
name = "solana_bpf_rust_invoked"
crate-type = ["lib", "cdylib"]
[package.metadata.docs.rs]
targets = ["x86_64-unknown-linux-gnu"]

2
programs/bpf/rust/invoked/src/lib.rs
View File

@ -158,3 +158,5 @@ fn process_instruction(
Ok(())
}
solana_sdk_bpf_test::stubs!();

6
sdk/bpf/rust/test/src/lib.rs
View File

@ -13,6 +13,11 @@ pub fn sol_log_64_(arg1: u64, arg2: u64, arg3: u64, arg4: u64, arg5: u64) {
std::println!("{} {} {} {} {}", arg1, arg2, arg3, arg4, arg5);
}
#[no_mangle]
pub fn sol_invoke_signed_rust() {
std::println!("sol_invoke_signed_rust()");
}
#[macro_export]
macro_rules! stubs {
() => {
@ -21,6 +26,7 @@ macro_rules! stubs {
use $crate::*;
unsafe { sol_log_("sol_log_".as_ptr(), 8) };
sol_log_64_(1, 2, 3, 4, 5);
sol_invoke_signed_rust();
}
};
}