Moved generic sim options from simulator class.

randawn · Feb 4, 2017 · a910127 · a910127
1 parent f20d87c
commit a910127
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 6 deletions.
diff --git a/vunit/activehdl_interface.py b/vunit/activehdl_interface.py
@@ -39,7 +39,6 @@ class ActiveHDLInterface(SimulatorInterface):
         "activehdl.vsim_flags",
         "activehdl.vsim_flags.gui",
         "activehdl.init_file.gui",
-        "vhdl_assert_stop_level",
     ]
 
     @classmethod

diff --git a/vunit/ghdl_interface.py b/vunit/ghdl_interface.py
@@ -35,7 +35,6 @@ class GHDLInterface(SimulatorInterface):
     sim_options = [
         "ghdl.sim_flags",
         "ghdl.elab_flags",
-        "vhdl_assert_stop_level",
     ]
 
     @staticmethod

diff --git a/vunit/modelsim_interface.py b/vunit/modelsim_interface.py
@@ -53,7 +53,6 @@ class ModelSimInterface(VsimSimulatorMixin, SimulatorInterface):  # pylint: disa
         "modelsim.vsim_flags",
         "modelsim.vsim_flags.gui",
         "modelsim.init_file.gui",
-        "vhdl_assert_stop_level",
     ]
 
     @staticmethod

diff --git a/vunit/rivierapro_interface.py b/vunit/rivierapro_interface.py
@@ -42,7 +42,6 @@ class RivieraProInterface(VsimSimulatorMixin, SimulatorInterface):
         "rivierapro.vsim_flags",
         "rivierapro.vsim_flags.gui",
         "rivierapro.init_file.gui",
-        "vhdl_assert_stop_level",
     ]
 
     @classmethod

diff --git a/vunit/simulator_factory.py b/vunit/simulator_factory.py
@@ -59,9 +59,11 @@ def sim_options(cls):
         """
         Return all supported sim options
         """
-        result = set()
+        result = ["vhdl_assert_stop_level"]
         for sim_class in cls.supported_simulators():
-            result.update(sim_class.sim_options)
+            for opt in sim_class.sim_options:
+                assert opt.startswith(sim_class.name + ".")
+                result.append(opt)
 
         return result