'ghdl.elab_e' should not affect the non '--elaborate' behaviour

VUnit · Apr 14, 2019 · 5c840cf · 5c840cf
1 parent 9cdb9c9
commit 5c840cf
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/vunit/ghdl_interface.py b/vunit/ghdl_interface.py
@@ -227,11 +227,11 @@ def simulate(self,  # pylint: disable=too-many-locals
         if not exists(script_path):
             os.makedirs(script_path)
 
-        ghdl_e = config.sim_options.get("ghdl.elab_e", False)
+        ghdl_e = elaborate_only and config.sim_options.get("ghdl.elab_e", False)
 
         cmd = self._get_command(config, script_path, ghdl_e)
 
-        if elaborate_only:
+        if elaborate_only and not ghdl_e:
             cmd += ["--no-run"]
 
         if self._gtkwave_fmt is not None and not ghdl_e:
@@ -255,7 +255,7 @@ def simulate(self,  # pylint: disable=too-many-locals
         except Process.NonZeroExitCode:
             status = False
 
-        if self._gui and not elaborate_only and not ghdl_e:
+        if self._gui and not elaborate_only:
             cmd = ["gtkwave"] + shlex.split(self._gtkwave_args) + [data_file_name]
 
             init_file = config.sim_options.get(self.name + ".gtkwave_script.gui", None)

diff --git a/vunit/test_suites.py b/vunit/test_suites.py
@@ -164,7 +164,7 @@ def run(self, output_path, read_output):
 
         sim_ok = self._simulate(output_path)
 
-        if self._elaborate_only or self._config.sim_options.get("ghdl.elab_e", False):
+        if self._elaborate_only:
             status = PASSED if sim_ok else FAILED
             return dict((name, status) for name in self._test_cases)