Fixed -ini flag detection in Questa/Modelsim vcom help

Author: LarsAsplund

tests/unit/test_modelsim_interface.py

@@ -257,11 +257,11 @@ def test_compile_project_verilog_define(self, process, check_output, modelsim_ch
         ]
         check_output.assert_called_once_with(process_args, env=simif.get_env())
 
-    def _get_inis(self):
+    def _get_inis(self, name="modelsim"):
         return (
-            str(Path(self.output_path) / "modelsim.ini"),
-            str(Path(self.prefix_path) / ".." / "modelsim.ini"),
-            str(Path(self.test_path) / "my_modelsim.ini"),
+            str(Path(self.output_path) / f"{name}.ini"),
+            str(Path(self.prefix_path) / ".." / f"{name}.ini"),
+            str(Path(self.test_path) / f"my_{name}.ini"),
         )
 
     @mock.patch("vunit.sim_if.modelsim.check_output", autospec=True, return_value="")
@@ -330,6 +330,52 @@ def test_overwrites_modelsim_ini_file_from_user(self, _check_output):
         with open(modelsim_ini, "r") as fptr:
             self.assertEqual(fptr.read(), "user")
 
+    @mock.patch("vunit.sim_if.vsim_simulator_mixin.Process", autospec=True)
+    def test_modelsim_ini_file_detection(self, vsim_simulator_mixin_process):
+        (_, _, user_modelsim_ini) = self._get_inis("questa")
+
+        with open(user_modelsim_ini, "w") as fptr:
+            fptr.write("user")
+
+        def check_output(*args, **kwargs):
+            return """\
+  -initoutcompositeparam
+                     Initialize array and record mode OUT parameters of subprogram
+  -modelsimini <modelsim.ini>
+                     Specify path to the modelsim.ini file.
+"""
+
+        with (
+            set_env(VUNIT_MODELSIM_INI=user_modelsim_ini),
+            mock.patch("vunit.sim_if.vsim_simulator_mixin.Process", return_value=None),
+            mock.patch("vunit.sim_if.modelsim.check_output", side_effect=check_output),
+        ):
+            simif = ModelSimInterface(prefix=self.prefix_path, output_path=self.output_path, persistent=False)
+            self.assertEqual(simif._ini_flag, "-modelsimini")
+            self.assertEqual(simif._ini_file, "modelsim.ini")
+
+    @mock.patch("vunit.sim_if.vsim_simulator_mixin.Process", autospec=True)
+    def test_questa_ini_file_detection(self, vsim_simulator_mixin_process):
+        (_, _, user_questa_ini) = self._get_inis("questa")
+
+        with open(user_questa_ini, "w") as fptr:
+            fptr.write("user")
+
+        def check_output(*args, **kwargs):
+            return """\
+-modelsimini <modelsim.ini>     Specify path to the modelsim.ini file
+-ini <questa.ini>               Specify path to the questa.ini file
+"""
+
+        with (
+            set_env(VUNIT_MODELSIM_INI=user_questa_ini),
+            mock.patch("vunit.sim_if.vsim_simulator_mixin.Process", return_value=None),
+            mock.patch("vunit.sim_if.modelsim.check_output", side_effect=check_output),
+        ):
+            simif = ModelSimInterface(prefix=self.prefix_path, output_path=self.output_path, persistent=False)
+            self.assertEqual(simif._ini_flag, "-ini")
+            self.assertEqual(simif._ini_file, "questa.ini")
+
     @mock.patch("vunit.sim_if.modelsim.check_output", autospec=True, return_value="")
     @mock.patch("vunit.sim_if.modelsim.LOGGER", autospec=True)
     @mock.patch("vunit.sim_if.check_output", autospec=True, return_value="")

vunit/sim_if/modelsim.py

@@ -119,7 +119,7 @@ def _find_in_help(self, prefix: str, tool: str, key: str) -> bool:
         """
         try:
             help_output = check_output([str(Path(prefix) / tool), "-help", "all"], env=self.get_env())
-            return key in help_output
+            return key in help_output.split()
         except Process.NonZeroExitCode:
             return False