646b892680
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s
31 lines
1.2 KiB
Diff
31 lines
1.2 KiB
Diff
--- a/tests/integration.rs
|
|
+++ b/tests/integration.rs
|
|
@@ -16,20 +16,13 @@ impl CommandUnderTest {
|
|
fn new() -> CommandUnderTest {
|
|
// To find the directory where the built binary is, we walk up the directory tree of the test binary until the
|
|
// parent is "target/".
|
|
- let mut binary_path = env::current_exe().expect("need current binary path to find binary to test");
|
|
- loop {
|
|
- {
|
|
- let parent = binary_path.parent();
|
|
- if parent.is_none() {
|
|
- panic!("Failed to locate binary path from original path: {:?}", env::current_exe());
|
|
- }
|
|
- let parent = parent.unwrap();
|
|
- if parent.is_dir() && parent.file_name().unwrap() == "target" {
|
|
- break;
|
|
- }
|
|
- }
|
|
- binary_path.pop();
|
|
- }
|
|
+ let mut binary_path = PathBuf::from(
|
|
+ env::current_dir()
|
|
+ .unwrap()
|
|
+ .join("target")
|
|
+ .join("@shortTarget@")
|
|
+ .join(env!("cargoBuildType")),
|
|
+ );
|
|
|
|
binary_path.push(
|
|
if cfg!(target_os = "windows") {
|