Merge pull request #803 from fluidvanadium/test_binaries_loc

moved test_binaries
zingolabs · Feb 5, 2024 · 8698549 · 8698549
2 parents a7d148e + 1972446
commit 8698549
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 6 deletions.
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -59,10 +59,10 @@ jobs:
         uses: actions/checkout@v3
 
       - name: create binaries dir
-        run: mkdir -p ./zingo-testutils/test_binaries/bins
+        run: mkdir -p ./test_binaries/bins
 
       - name: Symlink lightwalletd and zcash binaries
-        run: ln -s /usr/bin/lightwalletd /usr/bin/zcashd /usr/bin/zcash-cli ./zingo-testutils/test_binaries/bins/
+        run: ln -s /usr/bin/lightwalletd /usr/bin/zcashd /usr/bin/zcash-cli ./test_binaries/bins/
 
       - name: Symlink zcash parameters
         run: ln -s /root/.zcash-params /github/home

diff --git a/.gitignore b/.gitignore
@@ -21,4 +21,7 @@ zingolib/test-data/*
 zingo-testutils/test_binaries/bins/lightwalletd
 zingo-testutils/test_binaries/bins/zcash-cli
 zingo-testutils/test_binaries/bins/zcashd
+test_binaries/bins/lightwalletd
+test_binaries/bins/zcash-cli
+test_binaries/bins/zcashd
 
diff --git a/...-testutils/test_binaries/bins/.gitinclude → test_binaries/bins/.gitinclude b/...-testutils/test_binaries/bins/.gitinclude → test_binaries/bins/.gitinclude
diff --git a/zingo-testutils/test_binaries/bins/README.md → test_binaries/bins/README.md b/zingo-testutils/test_binaries/bins/README.md → test_binaries/bins/README.md
diff --git a/zingo-testutils/src/paths.rs b/zingo-testutils/src/paths.rs
@@ -11,7 +11,5 @@ pub fn get_regtest_dir() -> PathBuf {
 pub fn get_bin_dir() -> PathBuf {
     let mut dir = get_cargo_manifest_dir();
     dir.pop();
-    dir.join("zingo-testutils")
-        .join("test_binaries")
-        .join("bins")
+    dir.join("test_binaries").join("bins")
 }
diff --git a/zingo-testutils/src/regtest.rs b/zingo-testutils/src/regtest.rs
@@ -131,7 +131,7 @@ pub fn launch_lightwalletd(
         .stdout(std::process::Stdio::piped())
         .stderr(std::process::Stdio::piped())
         .spawn()
-        .expect("failed to start lightwalletd. It's possible the lightwalletd binary is not in the $G/zingo-testutils/test_binaries/bins/. see docs/integration-tests.txt");
+        .expect("failed to start lightwalletd. It's possible the lightwalletd binary is not in the $G/test_binaries/bins/. see docs/integration-tests.txt");
 
     if let Some(mut lwd_stdout_data) = lightwalletd_child.stdout.take() {
         std::thread::spawn(move || {