Ensure breaklevel is set in Active-HDL gui since vunit_run is not def…

…ined
jonasalowersson · Sep 23, 2015 · 83402d5 · 83402d5
1 parent 8c5bc11
commit 83402d5
Showing 1 changed file with 11 additions and 10 deletions.
diff --git a/vunit/activehdl_interface.py b/vunit/activehdl_interface.py
@@ -199,6 +199,12 @@ def _create_load_function(self,  # pylint: disable=too-many-arguments
         return 1
     }}
 
+    global breakassertlevel
+    set breakassertlevel {breaklevel}
+
+    global builtinbreakassertlevel
+    set builtinbreakassertlevel $breakassertlevel
+
     set no_vhdl_test_runner_exit [catch {{examine /run_base_pkg/runner.exit_simulation}}]
     if {{${{no_vhdl_test_runner_exit}}}}  {{
         echo {{Error: No vunit test runner package used}}
@@ -207,23 +213,18 @@ def _create_load_function(self,  # pylint: disable=too-many-arguments
     return 0
 }}
 """.format(set_generic_str=set_generic_str,
-           vsim_flags=" ".join(vsim_flags))
+           vsim_flags=" ".join(vsim_flags),
+           breaklevel=1 if config.fail_on_warning else 2)
 
         return tcl
 
     @staticmethod
-    def _create_run_function(fail_on_warning=False):
+    def _create_run_function():
         """
         Create the vunit_run function to run the test bench
         """
         return """
 proc vunit_run {} {
-    global breakassertlevel
-    set breakassertlevel %i
-
-    global builtinbreakassertlevel
-    set builtinbreakassertlevel $breakassertlevel
-
     set has_vhdl_runner [expr ![catch {examine /run_base_pkg/runner}]]
 
     if {${has_vhdl_runner}} {
@@ -246,7 +247,7 @@ def _create_run_function(fail_on_warning=False):
     }
     return $failed
 }
-""" % (1 if fail_on_warning else 2)
+"""
 
     def _create_common_script(self,   # pylint: disable=too-many-arguments
                               library_name, entity_name, architecture_name,
@@ -259,7 +260,7 @@ def _create_common_script(self,   # pylint: disable=too-many-arguments
         tcl += self._create_load_function(library_name, entity_name, architecture_name,
                                           config, output_path,
                                           config.disable_ieee_warnings)
-        tcl += self._create_run_function(config.fail_on_warning)
+        tcl += self._create_run_function()
         return tcl
 
     @staticmethod