From 21369892648d638a73c03f007e1fe00086a29ccd Mon Sep 17 00:00:00 2001 From: Joakim Hulthe Date: Wed, 28 Aug 2024 14:42:22 +0200 Subject: [PATCH] Add package-dir to "Could not find app" error --- test/test-manager/src/package.rs | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/test/test-manager/src/package.rs b/test/test-manager/src/package.rs index 295557907e19..47915563926b 100644 --- a/test/test-manager/src/package.rs +++ b/test/test-manager/src/package.rs @@ -100,9 +100,9 @@ fn find_app( app.make_ascii_lowercase(); let current_dir = std::env::current_dir().expect("Unable to get current directory"); - let packages_dir = package_dir.unwrap_or(¤t_dir); - std::fs::create_dir_all(packages_dir)?; - let dir = std::fs::read_dir(packages_dir.clone()).context("Failed to list packages")?; + let package_dir = package_dir.unwrap_or(¤t_dir); + std::fs::create_dir_all(package_dir)?; + let dir = std::fs::read_dir(package_dir.clone()).context("Failed to list packages")?; dir .filter_map(|entry| entry.ok()) @@ -129,12 +129,14 @@ fn find_app( }) // Skip file if it doesn't match the architecture .sorted_unstable_by_key(|(_path, u8_path)| u8_path.len()) .find(|(_path, u8_path)| u8_path.contains(&app)) // Find match - .map(|(path, _)| path).context(if e2e_bin { + .map(|(path, _)| path) + .with_context(|| format!("Directory searched: {}", package_dir.display())) + .with_context(|| if e2e_bin { format!( "Could not find UI/e2e test for package: {app}.\n\ Expecting a binary named like `app-e2e-tests-{app}_ARCH` to exist in {package_dir}/\n\ Example ARCH: `amd64-unknown-linux-gnu`, `x86_64-unknown-linux-gnu`", - package_dir = packages_dir.display() + package_dir = package_dir.display() ) } else { format!("Could not find package for app: {app}")