Canonicalize paths for CI

Author: oli-obk

src/lib.rs

@@ -74,6 +74,13 @@ impl Default for Config {
     }
 }
 
+impl Config {
+    pub fn stderr_filter(&mut self, pattern: &str, replacement: &'static str) {
+        self.stderr_filters
+            .push((Regex::new(pattern).unwrap(), replacement));
+    }
+}
+
 #[derive(Debug)]
 pub struct DependencyBuilder {
     pub program: PathBuf,

tests/integrations/basic/tests/actual_tests/foomp.stderr

@@ -7,7 +7,7 @@ error[E0308]: mismatched types
   |     arguments to this function are incorrect
   |
 note: function defined here
- --> /home/ubuntu/crates/ui_test/tests/integrations/basic/src/lib.rs:1:8
+ --> $DIR/tests/integrations/basic/src/lib.rs:1:8
   |
 1 | pub fn add(left: usize, right: usize) -> usize {
   |        ^^^

tests/integrations/basic/tests/ui_tests.rs

@@ -1,22 +1,34 @@
 use ui_test::*;
 
 fn main() -> ui_test::color_eyre::Result<()> {
-    let config = Config {
+    let path = "../../../target";
+    let mut config = Config {
         quiet: false,
         root_dir: "tests/actual_tests".into(),
         dependencies_crate_manifest_path: Some("tests/dummy_crate/Cargo.toml".into()),
         dependency_builder: Some(DependencyBuilder {
             program: std::path::PathBuf::from("cargo"),
             args: vec![],
-            envs: vec![("CARGO_TARGET_DIR".into(), "../../../target".into())],
+            envs: vec![("CARGO_TARGET_DIR".into(), path.into())],
         }),
         args: vec!["--edition=2021".into()],
         output_conflict_handling: if std::env::var_os("BLESS").is_some() {
             OutputConflictHandling::Bless
         } else {
             OutputConflictHandling::Error
         },
-        .. Config::default()
+        ..Config::default()
     };
+    config.stderr_filter(r"[^ ]*/\.?cargo/registry/.*/", "$$CARGO_REGISTRY");
+    config.stderr_filter(
+        &std::path::Path::new(path)
+            .canonicalize()
+            .unwrap()
+            .parent()
+            .unwrap()
+            .display()
+            .to_string(),
+        "$$DIR",
+    );
     ui_test::run_tests(config)
 }