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
9 changed files with 14 additions and 10 deletions

View File

@ -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))

View File

@ -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());

View File

@ -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();