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

Cleanup c programs (#1620)

Browse Source 
Cleanup C programs
This commit is contained in:
jackcmay
2018-10-26 19:38:07 -07:00
committed by GitHub
parent 9a6a399a29
commit 3488ea7d1c
27 changed files with 629 additions and 786 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
tests/programs.rs
View File

@ -22,9 +22,6 @@ use std::env;
#[cfg(feature = "bpf_c")]
use std::path::PathBuf;
/// BPF program file prefixes
#[cfg(feature = "bpf_c")]
const PLATFORM_FILE_PREFIX_BPF: &str = "";
/// BPF program file extension
#[cfg(feature = "bpf_c")]
const PLATFORM_FILE_EXTENSION_BPF: &str = "o";
@ -34,14 +31,14 @@ pub const PLATFORM_SECTION_C: &str = ".text.entrypoint";
/// Create a BPF program file name
#[cfg(feature = "bpf_c")]
fn create_bpf_path(name: &str) -> PathBuf {
let pathbuf = {
let mut pathbuf = {
let current_exe = env::current_exe().unwrap();
PathBuf::from(current_exe.parent().unwrap().parent().unwrap())
};
pathbuf.join(
PathBuf::from(PLATFORM_FILE_PREFIX_BPF.to_string() + name)
.with_extension(PLATFORM_FILE_EXTENSION_BPF),
)
pathbuf.push("bpf/");
pathbuf.push(name);
pathbuf.set_extension(PLATFORM_FILE_EXTENSION_BPF);
pathbuf
}
fn check_tx_results(bank: &Bank, tx: &Transaction, result: Vec<solana::bank::Result<()>>) {
@ -278,7 +275,7 @@ fn test_program_builtin_bpf_noop() {
let loader = Loader::new_bpf();
let program = Program::new(
&loader,
elf::File::open_path(&create_bpf_path("noop_c"))
elf::File::open_path(&create_bpf_path("noop"))
.unwrap()
.get_section(PLATFORM_SECTION_C)
.unwrap()
@ -310,7 +307,7 @@ fn test_program_bpf_noop_c() {
let loader = Loader::new_dynamic("bpf_loader");
let program = Program::new(
&loader,
elf::File::open_path(&create_bpf_path("noop_c"))
elf::File::open_path(&create_bpf_path("noop"))
.unwrap()
.get_section(PLATFORM_SECTION_C)
.unwrap()
@ -522,7 +519,7 @@ fn test_program_bpf_tictactoe_c() {
let loader = Loader::new_dynamic("bpf_loader");
let program = Program::new(
&loader,
elf::File::open_path(&create_bpf_path("tictactoe_c"))
elf::File::open_path(&create_bpf_path("tictactoe"))
.unwrap()
.get_section(PLATFORM_SECTION_C)
.unwrap()
@ -555,7 +552,7 @@ fn test_program_bpf_tictactoe_dashboard_c() {
let loader = Loader::new_dynamic("bpf_loader");
let ttt_program = Program::new(
&loader,
elf::File::open_path(&create_bpf_path("tictactoe_c"))
elf::File::open_path(&create_bpf_path("tictactoe"))
.unwrap()
.get_section(PLATFORM_SECTION_C)
.unwrap()
@ -590,7 +587,7 @@ fn test_program_bpf_tictactoe_dashboard_c() {
let dashboard_program = Program::new(
&loader,
elf::File::open_path(&create_bpf_path("tictactoe_dashboard_c"))
elf::File::open_path(&create_bpf_path("tictactoe_dashboard"))
.unwrap()
.get_section(PLATFORM_SECTION_C)
.unwrap()