[niepce] fwk+rust: fix tests xmp_meta_works test_merge_missing_into_xmp



commit 51f0ba11cf57a405168cdd228f99104e216ff9bd
Author: Hubert Figuière <hub figuiere net>
Date:   Sat Feb 15 00:29:44 2020 -0500

    fwk+rust: fix tests xmp_meta_works test_merge_missing_into_xmp

 crates/npc-fwk/src/utils/exempi.rs              | 3 ++-
 {src/fwk => crates/npc-fwk/src}/utils/test.xmp  | 0
 {src/fwk => crates/npc-fwk/src}/utils/test2.xmp | 0
 3 files changed, 2 insertions(+), 1 deletion(-)
---
diff --git a/crates/npc-fwk/src/utils/exempi.rs b/crates/npc-fwk/src/utils/exempi.rs
index b33b635..f23dd6f 100644
--- a/crates/npc-fwk/src/utils/exempi.rs
+++ b/crates/npc-fwk/src/utils/exempi.rs
@@ -535,7 +535,6 @@ mod tests {
         if let Ok(pdir) = env::var("CARGO_MANIFEST_DIR") {
             dir = PathBuf::from(pdir);
             dir.push("src");
-            dir.push("fwk");
             dir.push("utils");
         } else {
             dir = PathBuf::from(".");
@@ -592,6 +591,8 @@ mod tests {
     fn test_merge_missing_into_xmp() {
         let dir = get_xmp_sample_path();
 
+        // Both these files have to exist. They are on the source
+        // tree.
         let mut source = dir.clone();
         source.push("test.xmp");
 
diff --git a/src/fwk/utils/test.xmp b/crates/npc-fwk/src/utils/test.xmp
similarity index 100%
rename from src/fwk/utils/test.xmp
rename to crates/npc-fwk/src/utils/test.xmp
diff --git a/src/fwk/utils/test2.xmp b/crates/npc-fwk/src/utils/test2.xmp
similarity index 100%
rename from src/fwk/utils/test2.xmp
rename to crates/npc-fwk/src/utils/test2.xmp


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