Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

use target dir for integration tests TP #1342

Closed
wants to merge 1 commit into from
+7 −4
Closed

use target dir for integration tests TP #1342

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions roles/tests-integration/lib/template_provider.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,13 @@ pub struct TemplateProvider {

impl TemplateProvider {
pub fn start(port: u16, sv2_interval: u32) -> Self {
let temp_dir = PathBuf::from("/tmp/.template-provider");
// get the Cargo target directory from env or default to local "target"
let cargo_target_dir =
PathBuf::from(env::var("CARGO_TARGET_DIR").unwrap_or_else(|_| "target".to_string()));

let mut conf = Conf::default();
let staticdir = format!(".bitcoin-{}", port);
conf.staticdir = Some(temp_dir.join(staticdir));
conf.staticdir = Some(cargo_target_dir.join(staticdir));
let port_arg = format!("-sv2port={}", port);
let sv2_interval_arg = format!("-sv2interval={}", sv2_interval);
conf.args.extend(vec![
Expand All @@ -88,7 +91,7 @@ impl TemplateProvider {
let os = env::consts::OS;
let arch = env::consts::ARCH;
let download_filename = get_bitcoind_filename(os, arch);
let bitcoin_exe_home = temp_dir
let bitcoin_exe_home = cargo_target_dir
.join(format!("bitcoin-sv2-tp-{}", VERSION_TP))
.join("bin");

Expand All @@ -112,7 +115,7 @@ impl TemplateProvider {
create_dir_all(parent).unwrap();
}

unpack_tarball(&tarball_bytes, &temp_dir);
unpack_tarball(&tarball_bytes, &cargo_target_dir);

if os == "macos" {
let bitcoind_binary = bitcoin_exe_home.join("bitcoind");
Expand Down
Loading