Fix tb_path absolute path broken by VUnit#402. Fixes VUnit#406

FAIG2014 · Nov 7, 2018 · 8af4b9b · 8af4b9b
1 parent 3ee8f09
commit 8af4b9b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/vunit/test/acceptance/artificial/vhdl/tb_magic_paths.vhd b/vunit/test/acceptance/artificial/vhdl/tb_magic_paths.vhd
@@ -23,8 +23,8 @@ begin
     end procedure;
   begin
     test_runner_setup(runner, runner_cfg);
-    check_has_suffix(tb_path, "acceptance/artificial/vhdl/");
-    check_has_suffix(vunit_lib.run_pkg.tb_path(runner_cfg), "acceptance/artificial/vhdl/");
+    check_has_suffix(tb_path, "/vunit/test/acceptance/artificial/vhdl/");
+    check_has_suffix(vunit_lib.run_pkg.tb_path(runner_cfg), "/vunit/test/acceptance/artificial/vhdl/");
     test_runner_cleanup(runner);
     wait;
   end process;

diff --git a/vunit/ui.py b/vunit/ui.py
@@ -1295,6 +1295,7 @@ def add_source_file(self,  # pylint: disable=too-many-arguments
            library.add_source_file("file.vhd")
 
         """
+        file_name = abspath(file_name)
 
         if file_type is None:
             file_type = file_type_of(file_name)
@@ -1306,7 +1307,7 @@ def add_source_file(self,  # pylint: disable=too-many-arguments
             include_dirs = add_verilog_include_dir(include_dirs)
 
         new_file_name = self._parent._preprocess(  # pylint: disable=protected-access
-            self._library_name, abspath(file_name), preprocessors)
+            self._library_name, file_name, preprocessors)
 
         source_file = self._project.add_source_file(new_file_name,
                                                     self._library_name,