Harden and simplify some path resolutions

Author: oli-obk

tests/compiletest.rs

@@ -1,6 +1,6 @@
 use colored::*;
 use regex::Regex;
-use std::path::PathBuf;
+use std::path::{Path, PathBuf};
 use std::{env, ffi::OsString};
 use ui_test::{color_eyre::Result, Config, DependencyBuilder, Mode, OutputConflictHandling};
 
@@ -64,13 +64,10 @@ fn run_tests(mode: Mode, path: &str, target: Option<String>) -> Result<()> {
         program: miri_path(),
         output_conflict_handling,
         dependencies_crate_manifest_path: use_std
-            .then(|| std::env::current_dir().unwrap().join("test_dependencies").join("Cargo.toml")),
+            .then(|| Path::new("test_dependencies").join("Cargo.toml")),
         dependency_builder: Some(DependencyBuilder {
             program: PathBuf::from("bash"),
-            args: vec![
-                std::env::current_dir()?.join("miri").display().to_string(),
-                "cargo".to_string(),
-            ],
+            args: vec!["miri".to_string(), "cargo".to_string()],
             envs: vec![],
         }),
     };

ui_test/src/dependencies.rs

@@ -104,7 +104,9 @@ pub fn build_dependencies(config: &Config) -> Result<Dependencies> {
         let root = metadata
             .packages
             .iter()
-            .find(|package| package.manifest_path.as_std_path() == manifest_path)
+            .find(|package| {
+                package.manifest_path.as_std_path() == manifest_path.canonicalize().unwrap()
+            })
             .unwrap();
 
         // Then go over all of its dependencies