Add dependent crate test (#4647)

automerge
This commit is contained in:
Jack May 2019-06-11 11:45:13 -07:00 committed by Grimes
parent 3217a1d70c
commit 439e7cc26a
6 changed files with 56 additions and 1 deletions

View File

@ -67,7 +67,7 @@ fn main() {
.expect("Unable to create BPF install directory")
.success());
let rust_programs = ["alloc", "iter", "noop", "panic"];
let rust_programs = ["alloc", "dep_crate", "iter", "noop", "panic"];
for program in rust_programs.iter() {
println!(
"cargo:warning=(not a warning) Building Rust-based BPF programs: solana_bpf_rust_{}",

View File

@ -0,0 +1,3 @@
/target/
Cargo.lock

View File

@ -0,0 +1,23 @@
# Note: This crate must be built using build.sh
[package]
name = "solana-bpf-rust-dep-crate"
version = "0.16.0"
description = "Solana BPF iter program written in Rust"
authors = ["Solana Maintainers <maintainers@solana.com>"]
repository = "https://github.com/solana-labs/solana"
license = "Apache-2.0"
homepage = "https://solana.com/"
edition = "2018"
[dependencies]
byteorder = { version = "1", default-features = false }
solana-sdk-bpf-utils = { path = "../../../../sdk/bpf/rust-utils", version = "0.16.0" }
[workspace]
members = []
[lib]
crate-type = ["cdylib"]
name = "solana_bpf_rust_dep_crate"

View File

@ -0,0 +1,6 @@
[dependencies.compiler_builtins]
path = "../../../../sdk/bpf/rust-bpf-sysroot/src/compiler-builtins"
features = ["c", "mem"]
[target.bpfel-unknown-unknown.dependencies]
alloc = { path = "../../../../sdk/bpf/rust-bpf-sysroot/src/liballoc" }

View File

@ -0,0 +1,22 @@
//! @brief Example Rust-based BPF program tests dependent crates
#![no_std]
extern crate solana_sdk_bpf_utils;
use byteorder::{ByteOrder, LittleEndian};
use solana_sdk_bpf_utils::log::*;
#[no_mangle]
pub extern "C" fn entrypoint(_input: *mut u8) -> bool {
let mut buf = [0; 4];
LittleEndian::write_u32(&mut buf, 1_000_000);
assert_eq!(1_000_000, LittleEndian::read_u32(&buf));
let mut buf = [0; 2];
LittleEndian::write_i16(&mut buf, -5_000);
assert_eq!(-5_000, LittleEndian::read_i16(&buf));
sol_log("Success");
true
}

View File

@ -118,6 +118,7 @@ mod bpf {
("solana_bpf_rust_alloc", true),
("solana_bpf_rust_iter", true),
("solana_bpf_rust_noop", true),
("solana_bpf_rust_dep_crate", true),
("solana_bpf_rust_panic", false),
];
for program in programs.iter() {