tmp dirs target to farf (#5079)
This commit is contained in:
1
bench-exchange/.gitignore
vendored
1
bench-exchange/.gitignore
vendored
@ -1,3 +1,4 @@
|
||||
/target/
|
||||
/config/
|
||||
/config-local/
|
||||
/farf/
|
||||
|
1
bench-streamer/.gitignore
vendored
1
bench-streamer/.gitignore
vendored
@ -1 +1,2 @@
|
||||
/target/
|
||||
/farf/
|
||||
|
1
bench-tps/.gitignore
vendored
1
bench-tps/.gitignore
vendored
@ -1,3 +1,4 @@
|
||||
/target/
|
||||
/config/
|
||||
/config-local/
|
||||
/farf/
|
||||
|
1
chacha-sys/.gitignore
vendored
1
chacha-sys/.gitignore
vendored
@ -1 +1,2 @@
|
||||
/target/
|
||||
/farf/
|
||||
|
10
ci/nits.sh
10
ci/nits.sh
@ -46,16 +46,22 @@ if _ git --no-pager grep -n 'Default::default()' -- '*.rs'; then
|
||||
fi
|
||||
|
||||
# Let's keep a .gitignore for every crate, ensure it's got
|
||||
# /target/ in it
|
||||
# /target/ and /farf/ in it
|
||||
declare gitignores_ok=true
|
||||
for i in $(git --no-pager ls-files \*/Cargo.toml ); do
|
||||
dir=$(dirname "$i")
|
||||
if [[ ! -f $dir/.gitignore ]]; then
|
||||
echo 'error: nits.sh .gitnore missing for crate '"$dir" >&2
|
||||
gitignores_ok=false
|
||||
elif ! grep -q -e '^/target/$' "$dir"/.gitignore; then
|
||||
else
|
||||
if ! grep -q -e '^/target/$' "$dir"/.gitignore; then
|
||||
echo 'error: nits.sh "/target/" apparently missing from '"$dir"'/.gitignore' >&2
|
||||
gitignores_ok=false
|
||||
fi
|
||||
if ! grep -q -e '^/farf/$' "$dir"/.gitignore ; then
|
||||
echo 'error: nits.sh "/farf/" apparently missing from '"$dir"'/.gitignore' >&2
|
||||
gitignores_ok=false
|
||||
fi
|
||||
fi
|
||||
done
|
||||
"$gitignores_ok"
|
||||
|
1
client/.gitignore
vendored
1
client/.gitignore
vendored
@ -1 +1,2 @@
|
||||
/target/
|
||||
/farf/
|
||||
|
1
core/.gitignore
vendored
1
core/.gitignore
vendored
@ -1 +1,2 @@
|
||||
/target/
|
||||
/farf/
|
||||
|
@ -477,7 +477,7 @@ mod tests {
|
||||
}
|
||||
|
||||
fn get_tmp_snapshots_path() -> TempPaths {
|
||||
let out_dir = env::var("OUT_DIR").unwrap_or_else(|_| "target".to_string());
|
||||
let out_dir = env::var("OUT_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(|_| "target".to_string());
|
||||
let out_dir = env::var("OUT_DIR").unwrap_or_else(|_| "farf".to_string());
|
||||
let vpaths: Vec<_> = vpaths
|
||||
.iter()
|
||||
.map(|path| format!("{}/{}", out_dir, path))
|
||||
|
@ -1820,10 +1820,10 @@ 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(|_| "target".to_string());
|
||||
let out_dir = env::var("OUT_DIR").unwrap_or_else(|_| "farf".to_string());
|
||||
let keypair = Keypair::new();
|
||||
|
||||
let path = format!("{}/tmp/ledger/{}-{}", out_dir, name, keypair.pubkey());
|
||||
let path = format!("{}/ledger/{}-{}", out_dir, name, keypair.pubkey());
|
||||
|
||||
// whack any possible collision
|
||||
let _ignored = fs::remove_dir_all(&path);
|
||||
|
@ -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(|_| "target".to_string());
|
||||
let out_dir = env::var("OUT_DIR").unwrap_or_else(|_| "farf".to_string());
|
||||
let keypair = Keypair::new();
|
||||
|
||||
let mut path = PathBuf::new();
|
||||
|
1
drone/.gitignore
vendored
1
drone/.gitignore
vendored
@ -1 +1,2 @@
|
||||
/target/
|
||||
/farf/
|
||||
|
1
genesis/.gitignore
vendored
1
genesis/.gitignore
vendored
@ -1 +1,2 @@
|
||||
/target/
|
||||
/farf/
|
||||
|
1
gossip/.gitignore
vendored
1
gossip/.gitignore
vendored
@ -1 +1,2 @@
|
||||
/target/
|
||||
/farf/
|
||||
|
1
install/.gitignore
vendored
1
install/.gitignore
vendored
@ -1 +1,2 @@
|
||||
/target/
|
||||
/farf/
|
||||
|
1
keygen/.gitignore
vendored
1
keygen/.gitignore
vendored
@ -1 +1,2 @@
|
||||
/target/
|
||||
/farf/
|
||||
|
1
kvstore/.gitignore
vendored
1
kvstore/.gitignore
vendored
@ -1 +1,2 @@
|
||||
/target/
|
||||
/farf/
|
||||
|
1
ledger-tool/.gitignore
vendored
1
ledger-tool/.gitignore
vendored
@ -1 +1,2 @@
|
||||
/target/
|
||||
/farf/
|
||||
|
1
logger/.gitignore
vendored
1
logger/.gitignore
vendored
@ -1 +1,2 @@
|
||||
/target/
|
||||
/farf/
|
||||
|
1
measure/.gitignore
vendored
1
measure/.gitignore
vendored
@ -1 +1,2 @@
|
||||
/target/
|
||||
/farf/
|
||||
|
1
merkle-tree/.gitignore
vendored
1
merkle-tree/.gitignore
vendored
@ -1 +1,2 @@
|
||||
/target/
|
||||
/farf/
|
||||
|
1
metrics/.gitignore
vendored
1
metrics/.gitignore
vendored
@ -1 +1,2 @@
|
||||
/target/
|
||||
/farf/
|
||||
|
1
netutil/.gitignore
vendored
1
netutil/.gitignore
vendored
@ -1 +1,2 @@
|
||||
/target/
|
||||
/farf/
|
||||
|
1
programs/bpf/.gitignore
vendored
1
programs/bpf/.gitignore
vendored
@ -1 +1,2 @@
|
||||
/target/
|
||||
/farf/
|
||||
|
1
programs/bpf/rust/128bit/.gitignore
vendored
1
programs/bpf/rust/128bit/.gitignore
vendored
@ -1,3 +1,4 @@
|
||||
/target/
|
||||
|
||||
Cargo.lock
|
||||
/farf/
|
||||
|
1
programs/bpf/rust/128bit_dep/.gitignore
vendored
1
programs/bpf/rust/128bit_dep/.gitignore
vendored
@ -1,3 +1,4 @@
|
||||
/target/
|
||||
|
||||
Cargo.lock
|
||||
/farf/
|
||||
|
1
programs/bpf/rust/alloc/.gitignore
vendored
1
programs/bpf/rust/alloc/.gitignore
vendored
@ -1,3 +1,4 @@
|
||||
/target/
|
||||
|
||||
Cargo.lock
|
||||
/farf/
|
||||
|
1
programs/bpf/rust/dep_crate/.gitignore
vendored
1
programs/bpf/rust/dep_crate/.gitignore
vendored
@ -1,3 +1,4 @@
|
||||
/target/
|
||||
|
||||
Cargo.lock
|
||||
/farf/
|
||||
|
1
programs/bpf/rust/external_spend/.gitignore
vendored
1
programs/bpf/rust/external_spend/.gitignore
vendored
@ -1,3 +1,4 @@
|
||||
/target/
|
||||
|
||||
Cargo.lock
|
||||
/farf/
|
||||
|
1
programs/bpf/rust/iter/.gitignore
vendored
1
programs/bpf/rust/iter/.gitignore
vendored
@ -1,3 +1,4 @@
|
||||
/target/
|
||||
|
||||
Cargo.lock
|
||||
/farf/
|
||||
|
1
programs/bpf/rust/many_args/.gitignore
vendored
1
programs/bpf/rust/many_args/.gitignore
vendored
@ -1,3 +1,4 @@
|
||||
/target/
|
||||
|
||||
Cargo.lock
|
||||
/farf/
|
||||
|
1
programs/bpf/rust/many_args_dep/.gitignore
vendored
1
programs/bpf/rust/many_args_dep/.gitignore
vendored
@ -1,3 +1,4 @@
|
||||
/target/
|
||||
|
||||
Cargo.lock
|
||||
/farf/
|
||||
|
1
programs/bpf/rust/noop/.gitignore
vendored
1
programs/bpf/rust/noop/.gitignore
vendored
@ -1,3 +1,4 @@
|
||||
/target/
|
||||
|
||||
Cargo.lock
|
||||
/farf/
|
||||
|
1
programs/bpf/rust/panic/.gitignore
vendored
1
programs/bpf/rust/panic/.gitignore
vendored
@ -1,3 +1,4 @@
|
||||
/target/
|
||||
|
||||
Cargo.lock
|
||||
/farf/
|
||||
|
1
programs/bpf/rust/tick_height/.gitignore
vendored
1
programs/bpf/rust/tick_height/.gitignore
vendored
@ -1,3 +1,4 @@
|
||||
/target/
|
||||
|
||||
Cargo.lock
|
||||
/farf/
|
||||
|
1
programs/bpf_loader_api/.gitignore
vendored
1
programs/bpf_loader_api/.gitignore
vendored
@ -1 +1,2 @@
|
||||
/target/
|
||||
/farf/
|
||||
|
1
programs/bpf_loader_program/.gitignore
vendored
1
programs/bpf_loader_program/.gitignore
vendored
@ -1 +1,2 @@
|
||||
/target/
|
||||
/farf/
|
||||
|
1
programs/budget_api/.gitignore
vendored
1
programs/budget_api/.gitignore
vendored
@ -1 +1,2 @@
|
||||
/target/
|
||||
/farf/
|
||||
|
1
programs/budget_program/.gitignore
vendored
1
programs/budget_program/.gitignore
vendored
@ -1 +1,2 @@
|
||||
/target/
|
||||
/farf/
|
||||
|
1
programs/config_api/.gitignore
vendored
1
programs/config_api/.gitignore
vendored
@ -1 +1,2 @@
|
||||
/target/
|
||||
/farf/
|
||||
|
1
programs/config_program/.gitignore
vendored
1
programs/config_program/.gitignore
vendored
@ -1 +1,2 @@
|
||||
/target/
|
||||
/farf/
|
||||
|
1
programs/exchange_api/.gitignore
vendored
1
programs/exchange_api/.gitignore
vendored
@ -1 +1,2 @@
|
||||
/target/
|
||||
/farf/
|
||||
|
1
programs/exchange_program/.gitignore
vendored
1
programs/exchange_program/.gitignore
vendored
@ -1 +1,2 @@
|
||||
/target/
|
||||
/farf/
|
||||
|
1
programs/failure_program/.gitignore
vendored
1
programs/failure_program/.gitignore
vendored
@ -1 +1,2 @@
|
||||
/target/
|
||||
/farf/
|
||||
|
1
programs/noop_program/.gitignore
vendored
1
programs/noop_program/.gitignore
vendored
@ -1 +1,2 @@
|
||||
/target/
|
||||
/farf/
|
||||
|
1
programs/stake_api/.gitignore
vendored
1
programs/stake_api/.gitignore
vendored
@ -1 +1,2 @@
|
||||
/target/
|
||||
/farf/
|
||||
|
1
programs/stake_program/.gitignore
vendored
1
programs/stake_program/.gitignore
vendored
@ -1 +1,2 @@
|
||||
/target/
|
||||
/farf/
|
||||
|
1
programs/stake_tests/.gitignore
vendored
1
programs/stake_tests/.gitignore
vendored
@ -1 +1,2 @@
|
||||
/target/
|
||||
/farf/
|
||||
|
1
programs/storage_api/.gitignore
vendored
1
programs/storage_api/.gitignore
vendored
@ -1 +1,2 @@
|
||||
/target/
|
||||
/farf/
|
||||
|
1
programs/storage_program/.gitignore
vendored
1
programs/storage_program/.gitignore
vendored
@ -1 +1,2 @@
|
||||
/target/
|
||||
/farf/
|
||||
|
1
programs/token_api/.gitignore
vendored
1
programs/token_api/.gitignore
vendored
@ -1 +1,2 @@
|
||||
/target/
|
||||
/farf/
|
||||
|
1
programs/token_program/.gitignore
vendored
1
programs/token_program/.gitignore
vendored
@ -1 +1,2 @@
|
||||
/target/
|
||||
/farf/
|
||||
|
1
programs/vote_api/.gitignore
vendored
1
programs/vote_api/.gitignore
vendored
@ -1 +1,2 @@
|
||||
/target/
|
||||
/farf/
|
||||
|
1
programs/vote_program/.gitignore
vendored
1
programs/vote_program/.gitignore
vendored
@ -1 +1,2 @@
|
||||
/target/
|
||||
/farf/
|
||||
|
1
replicator/.gitignore
vendored
1
replicator/.gitignore
vendored
@ -1 +1,2 @@
|
||||
/target/
|
||||
/farf/
|
||||
|
1
runtime/.gitignore
vendored
1
runtime/.gitignore
vendored
@ -1 +1,2 @@
|
||||
/target/
|
||||
/farf/
|
||||
|
@ -77,7 +77,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(|_| "target".to_string());
|
||||
let out_dir = env::var("OUT_DIR").unwrap_or_else(|_| "farf".to_string());
|
||||
let keypair = Keypair::new();
|
||||
format!(
|
||||
"{}/{}/{}/{}",
|
||||
|
@ -750,7 +750,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(|_| "target".to_string());
|
||||
let out_dir = std::env::var("OUT_DIR").unwrap_or_else(|_| "farf".to_string());
|
||||
let vpaths: Vec<_> = vpaths
|
||||
.iter()
|
||||
.map(|path| format!("{}/{}", out_dir, path))
|
||||
|
@ -298,7 +298,7 @@ pub mod test_utils {
|
||||
}
|
||||
|
||||
pub fn get_append_vec_dir() -> String {
|
||||
std::env::var("OUT_DIR").unwrap_or_else(|_| "target/append_vec_tests".to_string())
|
||||
std::env::var("OUT_DIR").unwrap_or_else(|_| "farf/append_vec_tests".to_string())
|
||||
}
|
||||
|
||||
pub fn get_append_vec_path(path: &str) -> TempFile {
|
||||
|
1
sdk/.gitignore
vendored
1
sdk/.gitignore
vendored
@ -1 +1,2 @@
|
||||
/target/
|
||||
/farf/
|
||||
|
1
sdk/bpf/rust/rust-no-std/.gitignore
vendored
1
sdk/bpf/rust/rust-no-std/.gitignore
vendored
@ -1,3 +1,4 @@
|
||||
/target/
|
||||
|
||||
Cargo.lock
|
||||
/farf/
|
||||
|
1
sdk/bpf/rust/rust-test/.gitignore
vendored
1
sdk/bpf/rust/rust-test/.gitignore
vendored
@ -1,3 +1,4 @@
|
||||
/target/
|
||||
|
||||
Cargo.lock
|
||||
/farf/
|
||||
|
1
sdk/bpf/rust/rust-utils/.gitignore
vendored
1
sdk/bpf/rust/rust-utils/.gitignore
vendored
@ -1,3 +1,4 @@
|
||||
/target/
|
||||
|
||||
Cargo.lock
|
||||
/farf/
|
||||
|
@ -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(|_| "target".to_string());
|
||||
let out_dir = std::env::var("OUT_DIR").unwrap_or_else(|_| "farf".to_string());
|
||||
let keypair = Keypair::new();
|
||||
|
||||
let path = format!("{}/tmp/{}-{}", out_dir, name, keypair.pubkey());
|
||||
|
@ -147,7 +147,7 @@ mod tests {
|
||||
|
||||
fn tmp_file_path(name: &str) -> String {
|
||||
use std::env;
|
||||
let out_dir = env::var("OUT_DIR").unwrap_or_else(|_| "target".to_string());
|
||||
let out_dir = env::var("OUT_DIR").unwrap_or_else(|_| "farf".to_string());
|
||||
let keypair = Keypair::new();
|
||||
|
||||
format!("{}/tmp/{}-{}", out_dir, name, keypair.pubkey()).to_string()
|
||||
|
1
upload-perf/.gitignore
vendored
1
upload-perf/.gitignore
vendored
@ -1 +1,2 @@
|
||||
/target/
|
||||
/farf/
|
||||
|
1
validator-info/.gitignore
vendored
1
validator-info/.gitignore
vendored
@ -1 +1,2 @@
|
||||
/target/
|
||||
/farf/
|
||||
|
1
validator/.gitignore
vendored
1
validator/.gitignore
vendored
@ -1 +1,2 @@
|
||||
/target/
|
||||
/farf/
|
||||
|
1
vote-signer/.gitignore
vendored
1
vote-signer/.gitignore
vendored
@ -1 +1,2 @@
|
||||
/target/
|
||||
/farf/
|
||||
|
1
wallet/.gitignore
vendored
1
wallet/.gitignore
vendored
@ -1 +1,2 @@
|
||||
/target/
|
||||
/farf/
|
||||
|
@ -1883,7 +1883,7 @@ mod tests {
|
||||
);
|
||||
|
||||
fn make_tmp_path(name: &str) -> String {
|
||||
let out_dir = std::env::var("OUT_DIR").unwrap_or_else(|_| "target".to_string());
|
||||
let out_dir = std::env::var("OUT_DIR").unwrap_or_else(|_| "farf".to_string());
|
||||
let keypair = Keypair::new();
|
||||
|
||||
let path = format!("{}/tmp/{}-{}", out_dir, name, keypair.pubkey());
|
||||
|
Reference in New Issue
Block a user