[librsvg: 89/90] librsvg_crate/tests: Broken try at explicitly loading fixtures relative to CARGO_MANIFEST_DIR



commit 906d495aa01db2300930a403ec06e19c35be4352
Author: Federico Mena Quintero <federico gnome org>
Date:   Tue Mar 26 12:23:03 2019 -0600

    librsvg_crate/tests: Broken try at explicitly loading fixtures relative to CARGO_MANIFEST_DIR
    
    "make distcheck" is failing; this doesn't work yet.  But at least it
    will make it easier to fix the problem in a single place.

 librsvg_crate/tests/utils/mod.rs | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)
---
diff --git a/librsvg_crate/tests/utils/mod.rs b/librsvg_crate/tests/utils/mod.rs
index 147fbd83..51c618af 100644
--- a/librsvg_crate/tests/utils/mod.rs
+++ b/librsvg_crate/tests/utils/mod.rs
@@ -64,13 +64,26 @@ pub fn output_dir() -> PathBuf {
     path
 }
 
+pub fn fixture_dir() -> PathBuf {
+    let path = PathBuf::from(
+        env::var_os("CARGO_MANIFEST_DIR")
+            .expect(r#"CARGO_MANIFEST_DIR" is not set, please set it or run under "cargo test""#),
+    )
+    .join("tests")
+    .join("fixtures");
+
+    println!("looking for fixtures at {}", path.to_string_lossy());
+
+    path
+}
+
 pub fn compare_to_file(
     output_surf: &SharedImageSurface,
     output_base_name: &str,
     fixture_filename: &str,
 ) {
     let output_path = output_dir().join(&format!("{}-out.png", output_base_name));
-    let fixture_path = PathBuf::from(&format!("tests/fixtures/{}", fixture_filename));
+    let fixture_path = fixture_dir().join(fixture_filename);
 
     let mut output_file = File::create(output_path).unwrap();
     output_surf


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]