From 5aa80cd603939638c189072dd382d4ffd1c79ee4 Mon Sep 17 00:00:00 2001 From: morganamilo Date: Sun, 5 Nov 2023 10:31:33 +0000 Subject: [PATCH] a --- .github/workflows/paru.yml | 2 +- tests/common/mod.rs | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/.github/workflows/paru.yml b/.github/workflows/paru.yml index 639dc424..f9aab10b 100644 --- a/.github/workflows/paru.yml +++ b/.github/workflows/paru.yml @@ -65,4 +65,4 @@ jobs: run: cargo build --locked --features git,generate - name: Test - run: sudo -u nobody RUST_BACKTRACE=1 BUILDDIR=/tmp PKGDEST=/tmp SRCDEST=/tmp CARGO_HOME=/tmp/cargo cargo test --locked --features git,generate,mock --target-dir=/tmp -- --test-threads=1 --nocapture + run: sudo -u nobody BUILDDIR=/tmp PKGDEST=/tmp SRCDEST=/tmp CARGO_HOME=/tmp/cargo cargo test --locked --features git,generate,mock --target-dir=/tmp -- --test-threads=1 --nocapture diff --git a/tests/common/mod.rs b/tests/common/mod.rs index 834ec508..6525cfa5 100644 --- a/tests/common/mod.rs +++ b/tests/common/mod.rs @@ -13,6 +13,7 @@ async fn run(run_args: &[&str], repo: bool) -> Result<(TempDir, i32)> { let tmp = TempDir::new().unwrap(); let dir = tmp.path(); let testdata = Path::new(&var("CARGO_MANIFEST_DIR").unwrap()).join("testdata"); + println!("1"); let status = Command::new("cp") .arg("-rp") @@ -57,9 +58,15 @@ async fn run(run_args: &[&str], repo: bool) -> Result<(TempDir, i32)> { .status()?; assert!(status.success()); } + println!("2"); + println!("{} {}", dir.display(), testdata.display()); + println!("{}", dir.join("cache/pkg")); + println!("2.4"); std::fs::create_dir_all(dir.join("cache/pkg"))?; + println!("2.5"); std::fs::create_dir_all(testdata.join("pkg"))?; + println!("3"); let mut file = fs::OpenOptions::new() .append(true) @@ -137,6 +144,7 @@ async fn run(run_args: &[&str], repo: bool) -> Result<(TempDir, i32)> { let mut path = std::env::var("PATH").unwrap(); path.push(':'); path.push_str(testdata.join("bin").to_str().unwrap()); + println!("4"); std::env::set_var("PACMAN", "true"); std::env::set_var("PACMAN_CONF", dir.join("pacman.conf")); @@ -175,6 +183,7 @@ async fn run(run_args: &[&str], repo: bool) -> Result<(TempDir, i32)> { let ret = paru::run(&args).await; assert_eq!(ret, 0); } + println!("5"); args.extend(run_args); let ret = paru::run(&args).await;