diff --git a/core/src/bank_forks.rs b/core/src/bank_forks.rs index 8108fad9d..bb6c9f3da 100644 --- a/core/src/bank_forks.rs +++ b/core/src/bank_forks.rs @@ -477,7 +477,7 @@ mod tests { } 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); TempPaths { paths: path.to_string(), @@ -486,7 +486,7 @@ mod tests { fn get_tmp_bank_accounts_path(paths: &str) -> TempPaths { 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 .iter() .map(|path| format!("{}/{}", out_dir, path)) diff --git a/core/src/blocktree.rs b/core/src/blocktree.rs index b51514645..69a7c2c61 100644 --- a/core/src/blocktree.rs +++ b/core/src/blocktree.rs @@ -1820,7 +1820,7 @@ macro_rules! get_tmp_ledger_path { pub fn get_tmp_ledger_path(name: &str) -> String { 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 path = format!("{}/ledger/{}-{}", out_dir, name, keypair.pubkey()); diff --git a/core/src/replicator.rs b/core/src/replicator.rs index 690feb98e..926a870f1 100644 --- a/core/src/replicator.rs +++ b/core/src/replicator.rs @@ -910,7 +910,7 @@ mod tests { fn tmp_file_path(name: &str) -> PathBuf { 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 mut path = PathBuf::new(); diff --git a/runtime/src/accounts.rs b/runtime/src/accounts.rs index 4cacae406..5033e79d1 100644 --- a/runtime/src/accounts.rs +++ b/runtime/src/accounts.rs @@ -78,7 +78,7 @@ impl Accounts { fn make_new_dir() -> String { static ACCOUNT_DIR: AtomicUsize = AtomicUsize::new(0); 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(); format!( "{}/{}/{}/{}", diff --git a/runtime/src/accounts_db.rs b/runtime/src/accounts_db.rs index de046707b..c6eb2865c 100644 --- a/runtime/src/accounts_db.rs +++ b/runtime/src/accounts_db.rs @@ -789,7 +789,7 @@ mod tests { fn get_tmp_accounts_path(paths: &str) -> TempPaths { 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 .iter() .map(|path| format!("{}/{}", out_dir, path)) diff --git a/runtime/src/append_vec.rs b/runtime/src/append_vec.rs index f21f043d5..431db0934 100644 --- a/runtime/src/append_vec.rs +++ b/runtime/src/append_vec.rs @@ -93,6 +93,10 @@ impl AppendVec { .create(create) .open(file) .map_err(|e| { + warn!("in current dir {:?}", std::env::current_dir()); + for ancestor in file.ancestors() { + warn!("{:?} is {:?}", ancestor, std::fs::metadata(ancestor)); + } panic!( "Unable to {} data file {}, err {:?}", if create { "create" } else { "open" }, @@ -298,7 +302,7 @@ pub mod test_utils { } 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 { diff --git a/sdk/src/genesis_block.rs b/sdk/src/genesis_block.rs index 7da1adf47..305d09c47 100644 --- a/sdk/src/genesis_block.rs +++ b/sdk/src/genesis_block.rs @@ -194,7 +194,7 @@ mod tests { use crate::signature::{Keypair, KeypairUtil}; 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 path = format!("{}/tmp/{}-{}", out_dir, name, keypair.pubkey()); diff --git a/sdk/src/signature.rs b/sdk/src/signature.rs index 2174be379..008ceb3fa 100644 --- a/sdk/src/signature.rs +++ b/sdk/src/signature.rs @@ -154,7 +154,7 @@ mod tests { fn tmp_file_path(name: &str) -> String { 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(); format!("{}/tmp/{}-{}", out_dir, name, keypair.pubkey()).to_string() diff --git a/wallet/src/wallet.rs b/wallet/src/wallet.rs index 4b37d0c22..9984ffb6a 100644 --- a/wallet/src/wallet.rs +++ b/wallet/src/wallet.rs @@ -1901,7 +1901,7 @@ mod tests { ); 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 path = format!("{}/tmp/{}-{}", out_dir, name, keypair.pubkey());