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

no more OUT_DIR (#5139) 

* no more OUT_DIR

* no more OUT_DIR

* more information about failure
This commit is contained in:
Rob Walker 2019-07-17 14:27:58 -07:00 committed by GitHub
parent 0ffd91df27
commit 027ebb6670
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/bank_forks.rs
View File

@ -477,7 +477,7 @@ mod tests {
} }
fn get_tmp_snapshots_path() -> TempPaths { fn get_tmp_snapshots_path() -> TempPaths {
let out_dir = env::var("OUT_DIR").unwrap_or_else(|_| "farf".to_string()); let out_dir = env::var("FARF_DIR").unwrap_or_else(|_| "farf".to_string());
let path = format!("{}/snapshots", out_dir); let path = format!("{}/snapshots", out_dir);
TempPaths { TempPaths {
paths: path.to_string(), paths: path.to_string(),
@ -486,7 +486,7 @@ mod tests {
fn get_tmp_bank_accounts_path(paths: &str) -> TempPaths { fn get_tmp_bank_accounts_path(paths: &str) -> TempPaths {
let vpaths = get_paths_vec(paths); let vpaths = get_paths_vec(paths);
let out_dir = env::var("OUT_DIR").unwrap_or_else(|_| "farf".to_string()); let out_dir = env::var("FARF_DIR").unwrap_or_else(|_| "farf".to_string());
let vpaths: Vec<_> = vpaths let vpaths: Vec<_> = vpaths
.iter() .iter()
.map(|path| format!("{}/{}", out_dir, path)) .map(|path| format!("{}/{}", out_dir, path))

2
core/src/blocktree.rs
View File

@ -1820,7 +1820,7 @@ macro_rules! get_tmp_ledger_path {
pub fn get_tmp_ledger_path(name: &str) -> String { pub fn get_tmp_ledger_path(name: &str) -> String {
use std::env; use std::env;
let out_dir = env::var("OUT_DIR").unwrap_or_else(|_| "farf".to_string()); let out_dir = env::var("FARF_DIR").unwrap_or_else(|_| "farf".to_string());
let keypair = Keypair::new(); let keypair = Keypair::new();
let path = format!("{}/ledger/{}-{}", out_dir, name, keypair.pubkey()); let path = format!("{}/ledger/{}-{}", out_dir, name, keypair.pubkey());

2
core/src/replicator.rs
View File

@ -910,7 +910,7 @@ mod tests {
fn tmp_file_path(name: &str) -> PathBuf { fn tmp_file_path(name: &str) -> PathBuf {
use std::env; use std::env;
let out_dir = env::var("OUT_DIR").unwrap_or_else(|_| "farf".to_string()); let out_dir = env::var("FARF_DIR").unwrap_or_else(|_| "farf".to_string());
let keypair = Keypair::new(); let keypair = Keypair::new();
let mut path = PathBuf::new(); let mut path = PathBuf::new();

2
runtime/src/accounts.rs
View File

@ -78,7 +78,7 @@ impl Accounts {
fn make_new_dir() -> String { fn make_new_dir() -> String {
static ACCOUNT_DIR: AtomicUsize = AtomicUsize::new(0); static ACCOUNT_DIR: AtomicUsize = AtomicUsize::new(0);
let dir = ACCOUNT_DIR.fetch_add(1, Ordering::Relaxed); let dir = ACCOUNT_DIR.fetch_add(1, Ordering::Relaxed);
let out_dir = env::var("OUT_DIR").unwrap_or_else(|_| "farf".to_string()); let out_dir = env::var("FARF_DIR").unwrap_or_else(|_| "farf".to_string());
let keypair = Keypair::new(); let keypair = Keypair::new();
format!( format!(
"{}/{}/{}/{}", "{}/{}/{}/{}",

2
runtime/src/accounts_db.rs
View File

@ -789,7 +789,7 @@ mod tests {
fn get_tmp_accounts_path(paths: &str) -> TempPaths { fn get_tmp_accounts_path(paths: &str) -> TempPaths {
let vpaths = get_paths_vec(paths); let vpaths = get_paths_vec(paths);
let out_dir = std::env::var("OUT_DIR").unwrap_or_else(|_| "farf".to_string()); let out_dir = std::env::var("FARF_DIR").unwrap_or_else(|_| "farf".to_string());
let vpaths: Vec<_> = vpaths let vpaths: Vec<_> = vpaths
.iter() .iter()
.map(|path| format!("{}/{}", out_dir, path)) .map(|path| format!("{}/{}", out_dir, path))

6
runtime/src/append_vec.rs
View File

@ -93,6 +93,10 @@ impl AppendVec {
.create(create) .create(create)
.open(file) .open(file)
.map_err(|e| { .map_err(|e| {
warn!("in current dir {:?}", std::env::current_dir());
for ancestor in file.ancestors() {
warn!("{:?} is {:?}", ancestor, std::fs::metadata(ancestor));
}
panic!( panic!(
"Unable to {} data file {}, err {:?}", "Unable to {} data file {}, err {:?}",
if create { "create" } else { "open" }, if create { "create" } else { "open" },
@ -298,7 +302,7 @@ pub mod test_utils {
} }
pub fn get_append_vec_dir() -> String { pub fn get_append_vec_dir() -> String {
std::env::var("OUT_DIR").unwrap_or_else(|_| "farf/append_vec_tests".to_string()) std::env::var("FARF_DIR").unwrap_or_else(|_| "farf/append_vec_tests".to_string())
} }
pub fn get_append_vec_path(path: &str) -> TempFile { pub fn get_append_vec_path(path: &str) -> TempFile {

2
sdk/src/genesis_block.rs
View File

@ -194,7 +194,7 @@ mod tests {
use crate::signature::{Keypair, KeypairUtil}; use crate::signature::{Keypair, KeypairUtil};
fn make_tmp_path(name: &str) -> String { fn make_tmp_path(name: &str) -> String {
let out_dir = std::env::var("OUT_DIR").unwrap_or_else(|_| "farf".to_string()); let out_dir = std::env::var("FARF_DIR").unwrap_or_else(|_| "farf".to_string());
let keypair = Keypair::new(); let keypair = Keypair::new();
let path = format!("{}/tmp/{}-{}", out_dir, name, keypair.pubkey()); let path = format!("{}/tmp/{}-{}", out_dir, name, keypair.pubkey());

2
sdk/src/signature.rs
View File

@ -154,7 +154,7 @@ mod tests {
fn tmp_file_path(name: &str) -> String { fn tmp_file_path(name: &str) -> String {
use std::env; use std::env;
let out_dir = env::var("OUT_DIR").unwrap_or_else(|_| "farf".to_string()); let out_dir = env::var("FARF_DIR").unwrap_or_else(|_| "farf".to_string());
let keypair = Keypair::new(); let keypair = Keypair::new();
format!("{}/tmp/{}-{}", out_dir, name, keypair.pubkey()).to_string() format!("{}/tmp/{}-{}", out_dir, name, keypair.pubkey()).to_string()

2
wallet/src/wallet.rs
View File

@ -1901,7 +1901,7 @@ mod tests {
); );
fn make_tmp_path(name: &str) -> String { fn make_tmp_path(name: &str) -> String {
let out_dir = std::env::var("OUT_DIR").unwrap_or_else(|_| "farf".to_string()); let out_dir = std::env::var("FARF_DIR").unwrap_or_else(|_| "farf".to_string());
let keypair = Keypair::new(); let keypair = Keypair::new();
let path = format!("{}/tmp/{}-{}", out_dir, name, keypair.pubkey()); let path = format!("{}/tmp/{}-{}", out_dir, name, keypair.pubkey());