Fix windows unit test path problem

FAIG2014 · May 10, 2018 · 77bc096 · 77bc096
1 parent c043839
commit 77bc096
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/vunit/incisive_interface.py b/vunit/incisive_interface.py
@@ -302,7 +302,7 @@ def simulate(self,  # pylint: disable=too-many-locals
             args += config.sim_options.get('incisive.irun_sim_flags', [])
             args += ['-cdslib "%s"' % self._cdslib]
             args += self._hdlvar_args()
-            args += ['-log "%s/irun_%s.log"' % (script_path, step)]
+            args += ['-log "%s"' % join(script_path, "irun_%s.log" % step)]
             if not self._log_level == "debug":
                 args += ['-quiet']
             else:

diff --git a/vunit/test/unit/test_incisive_interface.py b/vunit/test/unit/test_incisive_interface.py
@@ -487,7 +487,7 @@ def test_simulate_vhdl(self, run_command, find_cds_root_irun, find_cds_root_virt
              '-work work',
              '-nclibdirname "%s"' % join(self.output_path, "libraries"),
              '-cdslib "%s"' % join(self.output_path, "cds.lib"),
-             '-log "suite_output_path/%s/irun_elaborate.log"' % simif.name,
+             '-log "%s"' % join("suite_output_path", simif.name, "irun_elaborate.log"),
              '-quiet',
              '-reflib "lib_path"',
              '-access +r',
@@ -508,7 +508,7 @@ def test_simulate_vhdl(self, run_command, find_cds_root_irun, find_cds_root_virt
              '-work work',
              '-nclibdirname "%s"' % join(self.output_path, "libraries"),
              '-cdslib "%s"' % join(self.output_path, "cds.lib"),
-             '-log "suite_output_path/%s/irun_simulate.log"' % simif.name,
+             '-log "%s"' % join("suite_output_path", simif.name, "irun_simulate.log"),
              '-quiet',
              '-reflib "lib_path"',
              '-access +r',
@@ -559,7 +559,7 @@ def test_simulate_verilog(self, run_command, find_cds_root_irun, find_cds_root_v
              '-work work',
              '-nclibdirname "%s"' % join(self.output_path, "libraries"),
              '-cdslib "%s"' % join(self.output_path, "cds.lib"),
-             '-log "suite_output_path/%s/irun_elaborate.log"' % simif.name,
+             '-log "%s"' % join("suite_output_path", simif.name, "irun_elaborate.log"),
              '-quiet',
              '-reflib "lib_path"',
              '-access +r',
@@ -580,7 +580,7 @@ def test_simulate_verilog(self, run_command, find_cds_root_irun, find_cds_root_v
              '-work work',
              '-nclibdirname "%s"' % join(self.output_path, "libraries"),
              '-cdslib "%s"' % join(self.output_path, "cds.lib"),
-             '-log "suite_output_path/%s/irun_simulate.log"' % simif.name,
+             '-log "%s"' % join("suite_output_path", simif.name, "irun_simulate.log"),
              '-quiet',
              '-reflib "lib_path"',
              '-access +r',
@@ -700,7 +700,7 @@ def test_elaborate(self, run_command, find_cds_root_irun, find_cds_root_virtuoso
              '-work work',
              '-nclibdirname "%s"' % join(self.output_path, "libraries"),
              '-cdslib "%s"' % join(self.output_path, "cds.lib"),
-             '-log "suite_output_path/%s/irun_elaborate.log"' % simif.name,
+             '-log "%s"' % join("suite_output_path", simif.name, "irun_elaborate.log"),
              '-quiet',
              '-access +r',
              '-input "@run"',
@@ -784,7 +784,7 @@ def test_simulate_gui(self, run_command, find_cds_root_irun, find_cds_root_virtu
              '-work work',
              '-nclibdirname "%s"' % join(self.output_path, "libraries"),
              '-cdslib "%s"' % join(self.output_path, "cds.lib"),
-             '-log "suite_output_path/%s/irun_elaborate.log"' % simif.name,
+             '-log "%s"' % join("suite_output_path", simif.name, "irun_elaborate.log"),
              '-quiet',
              '-reflib "lib_path"',
              '-access +rwc',
@@ -805,7 +805,7 @@ def test_simulate_gui(self, run_command, find_cds_root_irun, find_cds_root_virtu
              '-work work',
              '-nclibdirname "%s"' % join(self.output_path, "libraries"),
              '-cdslib "%s"' % join(self.output_path, "cds.lib"),
-             '-log "suite_output_path/%s/irun_simulate.log"' % simif.name,
+             '-log "%s"' % join("suite_output_path", simif.name, "irun_simulate.log"),
              '-quiet',
              '-reflib "lib_path"',
              '-access +rwc',