Merge pull request #12 from xffxff/relative_path

use relative paths in diagnostics for test cases
xffxff · Nov 12, 2023 · 8321278 · 8321278
2 parents e47220a + 7bab1a9
commit 8321278
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/lox_tests/diagnostics/error_in_function/output b/lox_tests/diagnostics/error_in_function/output
@@ -1,5 +1,5 @@
 Error: expected `;`
-   ╭─[/home/zhoufan/workspace/rust/lox/lox_tests/diagnostics/error_in_function.lox:2:18]
+   ╭─[lox_tests/diagnostics/error_in_function.lox:2:18]
    │
  2 │     print "hello"
    │                  ┬  

diff --git a/src/main.rs b/src/main.rs
@@ -81,11 +81,18 @@ impl TestCase {
         }
     }
 
+    // relative path relative to crate root
+    fn relative_path(path: &Path) -> PathBuf {
+        let crate_root_dir = Path::new(env!("CARGO_MANIFEST_DIR"));
+        path.strip_prefix(crate_root_dir).unwrap().to_owned()
+    }
+
     fn test(self, db: &Database) {
         print!("test {} ... ", self.lox.display());
+        let relative_path = TestCase::relative_path(&self.lox);
         let input_file = InputFile::new(
             db,
-            Word::intern(db, self.lox.to_str().unwrap()),
+            Word::intern(db, relative_path.to_str().unwrap()),
             self.text.clone(),
         );