Enable iter test (#4542)

automerge
This commit is contained in:
Jack May
2019-06-07 16:44:14 -07:00
committed by Grimes
parent 8435fbfa0b
commit 66c41b3e8c
7 changed files with 26 additions and 10 deletions

View File

@ -25,7 +25,7 @@ solana-bpfloader = { path = "../bpf_loader", version = "0.16.0" }
solana-logger = { path = "../../logger", version = "0.16.0" }
solana-runtime = { path = "../../runtime", version = "0.16.0" }
solana-sdk = { path = "../../sdk", version = "0.16.0" }
solana_rbpf = "=0.1.12"
solana_rbpf = "=0.1.13"
[[bench]]
name = "bpf_loader"

View File

@ -2,7 +2,7 @@
#![no_std]
// #[macro_use]
#[macro_use]
extern crate alloc;
extern crate solana_sdk_bpf_utils;
@ -78,7 +78,6 @@ pub extern "C" fn entrypoint(_input: *mut u8) -> bool {
// alloc::alloc::dealloc(ptr, layout);
// }
// TODO gremlin causes crash only on CI
// {
// // Test allocated vector
@ -107,6 +106,20 @@ pub extern "C" fn entrypoint(_input: *mut u8) -> bool {
// assert_eq!(v.len(), ITERS);
// }
{
// Test allocated vector
const ITERS: usize = 100;
let ones = vec![1_u64; ITERS];
let mut sum: u64 = 0;
for (i, _v) in ones.iter().enumerate() {
sol_log_64(i as u64, 0, 0, 0, 0);
sum += ones[i as usize];
}
sol_log_64(0x4, 0, 0, 0, sum);
assert_eq!(sum, ITERS as u64);
}
sol_log("Success");
true
}

View File

@ -108,7 +108,7 @@ mod bpf {
let programs = [
"solana_bpf_rust_alloc",
// Disable due to #4271 "solana_bpf_rust_iter",
"solana_bpf_rust_iter",
"solana_bpf_rust_noop",
];
for program in programs.iter() {

View File

@ -16,7 +16,7 @@ log = "0.4.2"
serde = "1.0.92"
solana-logger = { path = "../../logger", version = "0.16.0" }
solana-sdk = { path = "../../sdk", version = "0.16.0" }
solana_rbpf = "=0.1.12"
solana_rbpf = "=0.1.13"
[lib]
crate-type = ["lib", "cdylib"]